Don't update app idle rules on updateRulesForRestrictPowerUL().

am: 0970046adf

Change-Id: I59d5daec570117f53e31837b61d8bb2886d35780
This commit is contained in:
Felipe Leme
2016-09-08 23:27:33 +00:00
committed by android-build-merger

View File

@@ -715,6 +715,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
synchronized (mUidRulesFirstLock) { synchronized (mUidRulesFirstLock) {
updatePowerSaveWhitelistUL(); updatePowerSaveWhitelistUL();
updateRulesForRestrictPowerUL(); updateRulesForRestrictPowerUL();
updateRulesForAppIdleUL();
} }
} }
}; };
@@ -2731,6 +2732,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
private void updateRulesForGlobalChangeAL(boolean restrictedNetworksChanged) { private void updateRulesForGlobalChangeAL(boolean restrictedNetworksChanged) {
Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "updateRulesForGlobalChangeAL"); Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "updateRulesForGlobalChangeAL");
try { try {
updateRulesForAppIdleUL();
updateRulesForRestrictPowerUL(); updateRulesForRestrictPowerUL();
updateRulesForRestrictBackgroundUL(); updateRulesForRestrictBackgroundUL();
@@ -2744,11 +2746,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
} }
} }
// TODO: rename / document to make it clear these are global (not app-specific) rules
private void updateRulesForRestrictPowerUL() { private void updateRulesForRestrictPowerUL() {
Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "updateRulesForRestrictPowerUL"); Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "updateRulesForRestrictPowerUL");
try { try {
updateRulesForDeviceIdleUL(); updateRulesForDeviceIdleUL();
updateRulesForAppIdleUL();
updateRulesForPowerSaveUL(); updateRulesForPowerSaveUL();
updateRulesForAllAppsUL(TYPE_RESTRICT_POWER); updateRulesForAllAppsUL(TYPE_RESTRICT_POWER);
} finally { } finally {