commit c6246b996d0f9c96f5f727d8f9894cb93a17a9b2
author Hugo Benichi <hugobenichi@google.com> Wed May 25 03:22:31 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 25 03:22:32 2016 +0000
tree 00de196d9301f7650eeea216ab3e3b5fcaea7de6
parent 5902c444d762c57682ce5807cf6b691343ce7e97
parent d3e46458583a9ae5c2392ec8c2c4e4c77effb8ca

Merge "Fix default network transition event recording" into nyc-dev

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 c30e540..2f2d8a4 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -4067,7 +4067,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);