commit 34eda2aa6f7c72ceb974517f1c7b905bcb0d0a8c
author Lorenzo Colitti <lorenzo@google.com> Fri Jul 01 13:20:10 2016 +0900
committer Lorenzo Colitti <lorenzo@google.com> Mon Jul 04 23:18:12 2016 +0900
tree cbc6de9a66376e548d4ecb8b3816639cd2a8589f
parent e0d1a03d4ee780ee782a5d7d966d87f7622d6a3d

Make registerDefaultNetwork work on metered networks.

Bug: 29927488
Change-Id: I3b705c2ab0d1493546ffa5185bb5b07d5e25c897

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 7abb967..b5ae299 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3952,8 +3952,11 @@
         } else {
             networkCapabilities = new NetworkCapabilities(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);
 
         if (timeoutMs < 0 || timeoutMs > ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_MS) {