LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Address ConnectivityManager API comments." am: 37c09c96b9 am: b57db6ef97

Browse Source 
am: 08ab9ea526

Change-Id: I8e5e44043bb7efde3e21650e7edf3f121aff1e6e
This commit is contained in:
Hugo Benichi
2017-05-19 23:36:09 +00:00
committed by android-build-merger
parent b1dfaef01b 37c09c96b9
commit 85c5572cc2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/net/ConnectivityManager.java
View File

@@ -2641,7 +2641,7 @@ public class ConnectivityManager {
/** /**
* Called if no network is found in the timeout time specified in * Called if no network is found in the timeout time specified in
* {@link #requestNetwork(NetworkRequest, int, NetworkCallback)} call. This callback is not * {@link #requestNetwork(NetworkRequest, NetworkCallback, int)} call. This callback is not
* called for the version of {@link #requestNetwork(NetworkRequest, NetworkCallback)} * called for the version of {@link #requestNetwork(NetworkRequest, NetworkCallback)}
* without timeout. When this callback is invoked the associated * without timeout. When this callback is invoked the associated
* {@link NetworkRequest} will have already been removed and released, as if * {@link NetworkRequest} will have already been removed and released, as if
@@ -2938,7 +2938,7 @@ public class ConnectivityManager {
* This {@link NetworkRequest} will live until released via * This {@link NetworkRequest} will live until released via
* {@link #unregisterNetworkCallback(NetworkCallback)} or the calling application exits. A * {@link #unregisterNetworkCallback(NetworkCallback)} or the calling application exits. A
* version of the method which takes a timeout is * version of the method which takes a timeout is
* {@link #requestNetwork(NetworkRequest, int, NetworkCallback)}. * {@link #requestNetwork(NetworkRequest, NetworkCallback, int)}.
* Status of the request can be followed by listening to the various * Status of the request can be followed by listening to the various
* callbacks described in {@link NetworkCallback}. The {@link Network} * callbacks described in {@link NetworkCallback}. The {@link Network}
* can be used to direct traffic to the network. * can be used to direct traffic to the network.
@@ -2973,7 +2973,7 @@ public class ConnectivityManager {
* This {@link NetworkRequest} will live until released via * This {@link NetworkRequest} will live until released via
* {@link #unregisterNetworkCallback(NetworkCallback)} or the calling application exits. A * {@link #unregisterNetworkCallback(NetworkCallback)} or the calling application exits. A
* version of the method which takes a timeout is * version of the method which takes a timeout is
* {@link #requestNetwork(NetworkRequest, int, NetworkCallback)}. * {@link #requestNetwork(NetworkRequest, NetworkCallback, int)}.
* Status of the request can be followed by listening to the various * Status of the request can be followed by listening to the various
* callbacks described in {@link NetworkCallback}. The {@link Network} * callbacks described in {@link NetworkCallback}. The {@link Network}
* can be used to direct traffic to the network. * can be used to direct traffic to the network.