| commit | 2e3d79675bedcf26b0127035c737b993fbae2bc5 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Mon May 03 04:06:34 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 03 04:06:34 2021 +0000 |
| tree | e647868a6dd611053d9b2daeba473c1533d77f41 | |
| parent | fb03ac13e041dc043c0d2dad844ba589445225e1 [diff] | |
| parent | efca123280bb2930ee58f68036d6459bf548850a [diff] |
Merge "Add doc to getNetworkCapabilities" am: 59d89299c9 am: 622e129d00 am: efca123280 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690668 Change-Id: I0c41878350ffe4015fe9e6034651f50366503dfe
diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java index 0c5eaa7..df81603 100644 --- a/framework/src/android/net/ConnectivityManager.java +++ b/framework/src/android/net/ConnectivityManager.java
@@ -1525,7 +1525,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