Merge "Update NPMS internal state when app idle parole state is changed." into oc-dev

am: 67e802dd5e Change-Id: I88cacca1d3a576b69dc0aaa6806b6c2901afa696
2017-04-13 01:59:13 +00:00
parent 67004e209d 67e802dd5e
commit 012ddf15c7
1 changed files with 6 additions and 1 deletions
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -2992,7 +2992,12 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
                // Skip if it had no restrictions to begin with
                if ((oldRules & MASK_ALL_NETWORKS) == 0) continue;
            }
-            updateRulesForPowerRestrictionsUL(uid, oldRules, paroled);
+            final int newUidRules = updateRulesForPowerRestrictionsUL(uid, oldRules, paroled);
+            if (newUidRules == RULE_NONE) {
+                mUidRules.delete(uid);
+            } else {
+                mUidRules.put(uid, newUidRules);
+            }
        }
    }