Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make the new NetworkRequest flavour consistent with the others."

Browse Source
This commit is contained in:
Lorenzo Colitti
2015-11-25 07:46:31 +00:00
committed by Android (Google) Code Review
parent 877a4e09ea d117946299
commit 2a2f855c4d
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
*/
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));
}