Merge "Small doc improvement" am: a997db7f40 am: 9f61ab08bd

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1838427

Change-Id: I8d7912f4e76952b899e9d72179a864d17ed8825a
This commit is contained in:
Chalard Jean
2021-09-30 08:14:26 +00:00
committed by Automerger Merge Worker

View File

@@ -1163,10 +1163,11 @@ public class ConnectivityManager {
* default data network. In the event that the current active default data * default data network. In the event that the current active default data
* network disconnects, the returned {@code Network} object will no longer * network disconnects, the returned {@code Network} object will no longer
* be usable. This will return {@code null} when there is no default * 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 * @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) @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
@Nullable @Nullable