summaryrefslogtreecommitdiffstats
path: root/services/core
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-06-03 10:03:58 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-06-03 16:09:19 -0700
commita563b3040672c17dcbdf966acb2efc60824563d7 (patch)
tree8eda3a5d15a273594c65db55b3f6b2aa79c6cf57 /services/core
parent28e023d0c621f00e357f52264baaedf72c1eeee7 (diff)
downloadframeworks_base-a563b3040672c17dcbdf966acb2efc60824563d7.zip
frameworks_base-a563b3040672c17dcbdf966acb2efc60824563d7.tar.gz
frameworks_base-a563b3040672c17dcbdf966acb2efc60824563d7.tar.bz2
powermanager: Extend scope of lock when updating blocked UIDs
* Stop WTFs from the system, we need to hold the lock when calling updatePowerStateLocked as one might expect. Change-Id: I344e93cd4ffef915f1684063a496b9e9bbfcb9a6
Diffstat (limited to 'services/core')
-rw-r--r--services/core/java/com/android/server/power/PowerManagerService.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 93637ea..a197c6e 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -3918,10 +3918,10 @@ public final class PowerManagerService extends SystemService
else {
mBlockedUids.clear();
}
- }
- if(changed){
- mDirty |= DIRTY_WAKE_LOCKS;
- updatePowerStateLocked();
+ if(changed){
+ mDirty |= DIRTY_WAKE_LOCKS;
+ updatePowerStateLocked();
+ }
}
}
}