| commit | 622e129d00cfe13db37c1eb56c1802e73dc69c6f | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Mon May 03 03:34:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 03 03:34:22 2021 +0000 |
| tree | 7f608dfd75ef6564e43f065a1bba3947a3540d14 | |
| parent | b481b9cef35dbb45946ae616de7fbc82ff26a2f2 [diff] | |
| parent | 59d89299c9cd165deb1291db88d18e6bc410717f [diff] |
Merge "Add doc to getNetworkCapabilities" am: 59d89299c9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690668 Change-Id: I81c764ca04e3a300272ba18faa35d9fb0ecb54b1
diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java index 3e2fbea..19764dd 100644 --- a/framework/src/android/net/ConnectivityManager.java +++ b/framework/src/android/net/ConnectivityManager.java
@@ -1561,7 +1561,7 @@ /** * Get the {@link NetworkCapabilities} for the given {@link Network}. This - * will return {@code null} if the network is unknown. + * will return {@code null} if the network is unknown or if the |network| argument is null. * * This will remove any location sensitive data in {@link TransportInfo} embedded in * {@link NetworkCapabilities#getTransportInfo()}. Some transport info instances like