| commit | 026c310600382ac12322279cdfe131fe340cf4e5 | [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 | 609fd0b91916e2e4464452954c202cc73979e8fd | |
| parent | 168985a8113ae3f9cd8cb8a6eb618ff22fce72ba [diff] | |
| parent | aaadd384e988311f8242d79ba7d8d6e0743ee44c [diff] |
Merge "Add doc to getNetworkCapabilities" am: bf213ad25f am: aaadd384e9 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