From 318e8eec0e1f9ef7936a2630295a60b50f62783c Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Wed, 25 Nov 2015 15:47:14 +0900 Subject: [PATCH] Make the new NetworkRequest flavour consistent with the others. Change-Id: I491eb0b6d2fa0f1c472c97ef403488407e71803e --- core/java/android/net/ConnectivityManager.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index a5f712e4a9..10307e4b3d 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)); }