Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move EventLogTags.writeDeviceIdle calls outside synchronized block." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-09 02:15:38 +00:00
committed by Android (Google) Code Review
parent 80e32028e7 ea01439ef2
commit b0e4d9e97b
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -2217,24 +2217,24 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
@Override @Override
public void setDeviceIdleMode(boolean enabled) { public void setDeviceIdleMode(boolean enabled) {
mContext.enforceCallingOrSelfPermission(MANAGE_NETWORK_POLICY, TAG); mContext.enforceCallingOrSelfPermission(MANAGE_NETWORK_POLICY, TAG);
Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "setDeviceIdleMode"); Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "setDeviceIdleMode");
try { try {
synchronized (mUidRulesFirstLock) { synchronized (mUidRulesFirstLock) {
if (mDeviceIdleMode != enabled) { if (mDeviceIdleMode == enabled) {
return;
}
mDeviceIdleMode = enabled; mDeviceIdleMode = enabled;
if (mSystemReady) { if (mSystemReady) {
// Device idle change means we need to rebuild rules for all // Device idle change means we need to rebuild rules for all
// known apps, so do a global refresh. // known apps, so do a global refresh.
updateRulesForRestrictPowerUL(); updateRulesForRestrictPowerUL();
} }
}
if (enabled) { if (enabled) {
EventLogTags.writeDeviceIdleOnPhase("net"); EventLogTags.writeDeviceIdleOnPhase("net");
} else { } else {
EventLogTags.writeDeviceIdleOffPhase("net"); EventLogTags.writeDeviceIdleOffPhase("net");
} }
}
}
} finally { } finally {
Trace.traceEnd(Trace.TRACE_TAG_NETWORK); Trace.traceEnd(Trace.TRACE_TAG_NETWORK);
} }

8
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -2538,9 +2538,12 @@ public final class PowerManagerService extends SystemService
boolean setDeviceIdleModeInternal(boolean enabled) { boolean setDeviceIdleModeInternal(boolean enabled) {
synchronized (mLock) { synchronized (mLock) {
if (mDeviceIdleMode != enabled) { if (mDeviceIdleMode == enabled) {
return false;
}
mDeviceIdleMode = enabled; mDeviceIdleMode = enabled;
updateWakeLockDisabledStatesLocked(); updateWakeLockDisabledStatesLocked();
}
if (enabled) { if (enabled) {
EventLogTags.writeDeviceIdleOnPhase("power"); EventLogTags.writeDeviceIdleOnPhase("power");
} else { } else {
@@ -2548,9 +2551,6 @@ public final class PowerManagerService extends SystemService
} }
return true; return true;
} }
return false;
}
}
boolean setLightDeviceIdleModeInternal(boolean enabled) { boolean setLightDeviceIdleModeInternal(boolean enabled) {
synchronized (mLock) { synchronized (mLock) {