commit c9bfc4272908fa118cd56174a110aa0e198fd2eb
author Felipe Leme <felipeal@google.com> Tue May 24 18:44:45 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 24 18:44:45 2016 +0000
tree 06811b197854ea4fd431ae13100e19ba321ba57c
parent da899a473fb95511c255abed038e0d12c4442a3d
parent b5987d79937b2f1b0ec68c84371aea36f7e2b8a1

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

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

Change-Id: If9e525f86b29960ed4dfdd6ca27bc5d0077454ae

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 389e045..9a80117 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -4069,7 +4069,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);