| commit | 050f198ec013c8eeedc2c4fc4f1eebb5e159a8f4 | [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 | 8c228de05a7ab31d50198921e40eaa232b6f8fdd | |
| parent | 2534f6b9163f6e7ee8546dc17ba95f3774726619 [diff] | |
| parent | 026c310600382ac12322279cdfe131fe340cf4e5 [diff] |
Merge "Add doc to getNetworkCapabilities" am: bf213ad25f am: aaadd384e9 am: 026c310600 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