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

Make the new NetworkRequest flavour consistent with the others.

Browse Source 
Change-Id: I491eb0b6d2fa0f1c472c97ef403488407e71803e
This commit is contained in:
Lorenzo Colitti
2015-11-25 15:47:14 +09:00
parent 7493d4695b
commit 318e8eec0e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2494,9 +2494,10 @@ public class ConnectivityManager {
* *
* @hide * @hide
*/ */
public void requestNetwork(NetworkCapabilities nc, NetworkCallback networkCallback, public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback,
int timeoutMs, int legacyType) { 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}. * {@code NetworkCapabilities}.
*/ */
public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback) { public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback) {
requestNetwork(request.networkCapabilities, networkCallback, 0, requestNetwork(request, networkCallback, 0,
inferLegacyTypeForNetworkCapabilities(request.networkCapabilities)); inferLegacyTypeForNetworkCapabilities(request.networkCapabilities));
} }
@@ -2560,7 +2561,7 @@ public class ConnectivityManager {
*/ */
public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback, public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback,
int timeoutMs) { int timeoutMs) {
requestNetwork(request.networkCapabilities, networkCallback, timeoutMs, requestNetwork(request, networkCallback, timeoutMs,
inferLegacyTypeForNetworkCapabilities(request.networkCapabilities)); inferLegacyTypeForNetworkCapabilities(request.networkCapabilities));
} }