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

ConnectivityManager: fix documentation

Browse Source 
Documentation pointing to the registerNetwork() overload including a
timeout argument was pointing to the version removed by commit
139a48c83c. This makes it impossible to
cherry pick 139a48c83c due to the linter
complaining about unresolvable links.

This patch fixes the documentation to point to the registerNetwork()
with argument types NetworkRequest, NetworkCallback, int, in that order.

Bug: 36370941
Test: no functional change
Change-Id: Ieaf58f81d89fdf63f480fd15e65ed52822fc4f51
This commit is contained in:
Hugo Benichi
2017-05-15 15:15:33 +09:00
parent 9b477410e2
commit 4c11db0fdd
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

@@ -2642,7 +2642,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
@@ -2939,7 +2939,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.
@@ -2974,7 +2974,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.