commit abf1e8259417e2d1be04376aedc87e5cd123a810
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 08 23:17:46 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 08 23:17:49 2016 +0000
tree 94b11440316148989fdebbde398b19e74e6cc7c5
parent cbed5a74a47e4d90bef42a87d02f52d46443097a
parent 0970046adf578c0003d5bfbd19a0ca58c18d96cc

Merge "Don't update app idle rules on updateRulesForRestrictPowerUL()." into nyc-mr1-dev

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 7626e2a..ed63613 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -715,6 +715,7 @@
             synchronized (mUidRulesFirstLock) {
                 updatePowerSaveWhitelistUL();
                 updateRulesForRestrictPowerUL();
+                updateRulesForAppIdleUL();
             }
         }
     };
@@ -2731,6 +2732,7 @@
     private void updateRulesForGlobalChangeAL(boolean restrictedNetworksChanged) {
         Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "updateRulesForGlobalChangeAL");
         try {
+            updateRulesForAppIdleUL();
             updateRulesForRestrictPowerUL();
             updateRulesForRestrictBackgroundUL();
 
@@ -2744,11 +2746,11 @@
         }
     }
 
+    // TODO: rename / document to make it clear these are global (not app-specific) rules
     private void updateRulesForRestrictPowerUL() {
         Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "updateRulesForRestrictPowerUL");
         try {
             updateRulesForDeviceIdleUL();
-            updateRulesForAppIdleUL();
             updateRulesForPowerSaveUL();
             updateRulesForAllAppsUL(TYPE_RESTRICT_POWER);
         } finally {