From e2d48ff57c5529b32a9cd7bfdcf21d29df539f73 Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Mon, 15 May 2017 15:15:33 +0900 Subject: [PATCH] ConnectivityManager: fix documentation Documentation pointing to the registerNetwork() overload including a timeout argument was pointing to the version removed by commit 15fd4395e13b4662a262ee67a5f75f5c521c62ef. This makes it impossible to cherry pick 15fd4395e13b4662a262ee67a5f75f5c521c62ef 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 --- core/java/android/net/ConnectivityManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index dadc5f53eb928..f4eca9ce81b2f 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -2642,7 +2642,7 @@ public class ConnectivityManager { /** * 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)} * without timeout. When this callback is invoked the associated * {@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 * {@link #unregisterNetworkCallback(NetworkCallback)} or the calling application exits. A * 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 * callbacks described in {@link NetworkCallback}. The {@link 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 * {@link #unregisterNetworkCallback(NetworkCallback)} or the calling application exits. A * 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 * callbacks described in {@link NetworkCallback}. The {@link Network} * can be used to direct traffic to the network.