joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Make registerDefaultNetwork work on metered networks.

Browse source 
am: 34eda2aa6f

Change-Id: I2d5edc273df22e5c787f227820c1ce956adfe42c
This commit is contained in:
Lorenzo Colitti 2016-07-04 16:06:51 +00:00 • committed by android-build-merger
commit 005ce5a697
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
services/core/java/com/android/server/ConnectivityService.java
View file

@ -3952,8 +3952,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
} else { } else {
networkCapabilities = new NetworkCapabilities(networkCapabilities); networkCapabilities = new NetworkCapabilities(networkCapabilities);
enforceNetworkRequestPermissions(networkCapabilities); enforceNetworkRequestPermissions(networkCapabilities);
// TODO: this is incorrect. We mark the request as metered or not depending on the state
// of the app when the request is filed, but we never change the request if the app
// changes network state. http://b/29964605
enforceMeteredApnPolicy(networkCapabilities);
} }
enforceMeteredApnPolicy(networkCapabilities);
ensureRequestableCapabilities(networkCapabilities); ensureRequestableCapabilities(networkCapabilities);
if (timeoutMs < 0 || timeoutMs > ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_MS) { if (timeoutMs < 0 || timeoutMs > ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_MS) {