commit ea01439ef2c6eb278b1b92fcdedc9e3d78a323b2
author Felipe Leme <felipeal@google.com> Tue Sep 06 13:59:54 2016 -0700
committer Felipe Leme <felipeal@google.com> Thu Sep 08 17:22:52 2016 -0700
tree b765fd23fb1df96daf3b78a4bf3215186f26751a
parent 8e91087c3a96caa6faa805b1d8daca84531d8a2d

Move EventLogTags.writeDeviceIdle calls outside synchronized block.

BUG: 31281543

Change-Id: I1cf5f80dda7ef0801a9fa9d0b5a5b207fc684cd5

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 ed63613..145bf1b 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -2215,23 +2215,23 @@
     @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) {
-                    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");
-                    }
+                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);

services/core/java/com/android/server/power/PowerManagerService.java

diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 2824e6e..570b93c 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -2538,18 +2538,18 @@
 
     boolean setDeviceIdleModeInternal(boolean enabled) {
         synchronized (mLock) {
-            if (mDeviceIdleMode != enabled) {
-                mDeviceIdleMode = enabled;
-                updateWakeLockDisabledStatesLocked();
-                if (enabled) {
-                    EventLogTags.writeDeviceIdleOnPhase("power");
-                } else {
-                    EventLogTags.writeDeviceIdleOffPhase("power");
-                }
-                return true;
+            if (mDeviceIdleMode == enabled) {
+                return false;
             }
-            return false;
+            mDeviceIdleMode = enabled;
+            updateWakeLockDisabledStatesLocked();
         }
+        if (enabled) {
+            EventLogTags.writeDeviceIdleOnPhase("power");
+        } else {
+            EventLogTags.writeDeviceIdleOffPhase("power");
+        }
+        return true;
     }
 
     boolean setLightDeviceIdleModeInternal(boolean enabled) {