commit | ecd8ec7141e2f94bba6d4f9c2e14ffc9926c1ca8 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Fri Jul 01 13:20:10 2016 +0900 |
committer | Lorenzo Colitti <lorenzo@google.com> | Fri Jul 01 04:42:58 2016 +0000 |
tree | bb7fdab6ecc9d6879c5310b9c4647905c7ca6b3c | |
parent | 0a5ae42e45b53a44ef90bb9cb6bede799edcf4de [diff] |
Make registerDefaultNetwork work on metered networks. Bug: 29927488 Change-Id: I3b705c2ab0d1493546ffa5185bb5b07d5e25c897
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index b12972c..534b544 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3978,8 +3978,8 @@ } else { networkCapabilities = new NetworkCapabilities(networkCapabilities); enforceNetworkRequestPermissions(networkCapabilities); + enforceMeteredApnPolicy(networkCapabilities); } - enforceMeteredApnPolicy(networkCapabilities); ensureRequestableCapabilities(networkCapabilities); if (timeoutMs < 0 || timeoutMs > ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_MS) {