commit b5987d79937b2f1b0ec68c84371aea36f7e2b8a1
author Felipe Leme <felipeal@google.com> Tue May 24 18:23:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 24 18:23:58 2016 +0000
tree 80befde4235f65c4bb0a8ce6848af37feab3d30e
parent 3c0c9b0f59233329e5a085598f0f1678ac717df0
parent 1411952a68f6fa2d2b3a3ee9599e24026454b19b

Merge "Fixed enforceMeteredApnPolicy when Data Saver is on." into nyc-dev am: efd3a1749f
am: 1411952a68

* commit '1411952a68f6fa2d2b3a3ee9599e24026454b19b':
  Fixed enforceMeteredApnPolicy when Data Saver is on.

Change-Id: I62eb108dfad2ac1ffd2b541470f01a7923d92731

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 c096fa5..95a9781 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -4066,7 +4066,8 @@
             synchronized(mRulesLock) {
                 uidRules = mUidRules.get(uid, RULE_ALLOW_ALL);
             }
-            if ((uidRules & RULE_ALLOW_ALL) == 0) {
+            if (mRestrictBackground && (uidRules & RULE_ALLOW_METERED) == 0
+                    && (uidRules & RULE_TEMPORARY_ALLOW_METERED) == 0) {
                 // we could silently fail or we can filter the available nets to only give
                 // them those they have access to.  Chose the more useful option.
                 networkCapabilities.addCapability(NET_CAPABILITY_NOT_METERED);