| commit | efca123280bb2930ee58f68036d6459bf548850a | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Mon May 03 03:50:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 03 03:50:18 2021 +0000 |
| tree | 7f608dfd75ef6564e43f065a1bba3947a3540d14 | |
| parent | 7d4cea500581618937b3e2e2083f5a705208221f [diff] | |
| parent | 622e129d00cfe13db37c1eb56c1802e73dc69c6f [diff] |
Merge "Add doc to getNetworkCapabilities" am: 59d89299c9 am: 622e129d00 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690668 Change-Id: Iab7908bbeb3fd58599d7702e44450a4224a78f5b
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