summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lorenzo Colitti <lorenzo@google.com> 2016-07-01 13:20:10 +0900
committer Lorenzo Colitti <lorenzo@google.com> 2016-07-01 04:42:58 +0000
commit09e3715661aa4b656e2f898ed4c65145413c0512 (patch)
tree8d61ac1ed88dbdae36fd7d3f50beee371121ebd8
parentfa7d97fa15700b62b01d0b7dd42fcaf12c57b9f5 (diff)
Make registerDefaultNetwork work on metered networks.
Bug: 29927488 Change-Id: I3b705c2ab0d1493546ffa5185bb5b07d5e25c897
-rw-r--r--services/core/java/com/android/server/ConnectivityService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index b12972ca51f7..534b544a0c15 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3978,8 +3978,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
} else {
networkCapabilities = new NetworkCapabilities(networkCapabilities);
enforceNetworkRequestPermissions(networkCapabilities);
+ enforceMeteredApnPolicy(networkCapabilities);
}
- enforceMeteredApnPolicy(networkCapabilities);
ensureRequestableCapabilities(networkCapabilities);
if (timeoutMs < 0 || timeoutMs > ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_MS) {