Merge "Move EventLogTags.writeDeviceIdle calls outside synchronized block." into nyc-mr1-dev (b0e4d9e9) · Commits · e / os / android_frameworks_base

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

+13 −13

Original line number	Diff line number	Diff line
		@@ -2217,24 +2217,24 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		@Override
		public void setDeviceIdleMode(boolean enabled) {
		mContext.enforceCallingOrSelfPermission(MANAGE_NETWORK_POLICY, TAG);

		Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "setDeviceIdleMode");
		try {
		synchronized (mUidRulesFirstLock) {
		if (mDeviceIdleMode != enabled) {
		if (mDeviceIdleMode == enabled) {
		return;
		}
		mDeviceIdleMode = enabled;
		if (mSystemReady) {
		// Device idle change means we need to rebuild rules for all
		// known apps, so do a global refresh.
		updateRulesForRestrictPowerUL();
		}
		}
		if (enabled) {
		EventLogTags.writeDeviceIdleOnPhase("net");
		} else {
		EventLogTags.writeDeviceIdleOffPhase("net");
		}
		}
		}
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_NETWORK);
		}

+10 −10

Original line number	Diff line number	Diff line
		@@ -2538,9 +2538,12 @@ public final class PowerManagerService extends SystemService

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

		boolean setLightDeviceIdleModeInternal(boolean enabled) {
		synchronized (mLock) {