diff options
| author | 2015-11-25 15:47:14 +0900 | |
|---|---|---|
| committer | 2015-11-25 15:47:14 +0900 | |
| commit | d1179462992c524684a924d432da508f0dd62c4a (patch) | |
| tree | 997ddb2bce58f24fdab0427646df48c7131a7737 | |
| parent | 7754abb2fc02041a3e9fd0dddb8325313836119d (diff) | |
Make the new NetworkRequest flavour consistent with the others.
Change-Id: I491eb0b6d2fa0f1c472c97ef403488407e71803e
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index a5f712e4a96d..10307e4b3de3 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -2494,9 +2494,10 @@ public class ConnectivityManager { * * @hide */ - public void requestNetwork(NetworkCapabilities nc, NetworkCallback networkCallback, + public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback, int timeoutMs, int legacyType) { - sendRequestForNetwork(nc, networkCallback, timeoutMs, REQUEST, legacyType); + sendRequestForNetwork(request.networkCapabilities, networkCallback, timeoutMs, REQUEST, + legacyType); } /** @@ -2529,7 +2530,7 @@ public class ConnectivityManager { * {@code NetworkCapabilities}. */ public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback) { - requestNetwork(request.networkCapabilities, networkCallback, 0, + requestNetwork(request, networkCallback, 0, inferLegacyTypeForNetworkCapabilities(request.networkCapabilities)); } @@ -2560,7 +2561,7 @@ public class ConnectivityManager { */ public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback, int timeoutMs) { - requestNetwork(request.networkCapabilities, networkCallback, timeoutMs, + requestNetwork(request, networkCallback, timeoutMs, inferLegacyTypeForNetworkCapabilities(request.networkCapabilities)); } |