| commit | c026795719ca201ed30ac9d69901d7c79e293c71 | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Thu Sep 30 08:15:01 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 30 08:15:01 2021 +0000 |
| tree | c190892a588ff0b897285bebfddc65153a695227 | |
| parent | 7a7c1a94f5123f2d797a1c30434e2683ff8bd577 [diff] | |
| parent | 9f61ab08bd0a7a4b1648bfd561eded39953ca953 [diff] |
Merge "Small doc improvement" am: a997db7f40 am: 9f61ab08bd Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1838427 Change-Id: If262f9460191a5aa9bcc19897e537223d0f2bb07
diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java index 474c381..b04b603 100644 --- a/framework/src/android/net/ConnectivityManager.java +++ b/framework/src/android/net/ConnectivityManager.java
@@ -1163,10 +1163,11 @@ * default data network. In the event that the current active default data * network disconnects, the returned {@code Network} object will no longer * be usable. This will return {@code null} when there is no default - * network. + * network, or when the default network is blocked. * * @return a {@link Network} object for the current default network or - * {@code null} if no default network is currently active + * {@code null} if no default network is currently active or if + * the default network is blocked for the caller */ @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) @Nullable