diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-03-12 18:49:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-12 18:49:09 +0000 |
| commit | db3146c039750f68418e0908037a8bed3890913c (patch) | |
| tree | cfa7ad0a262360a6c213ce993e03b1091315e1dc /services/java/com/android/server/power/PowerManagerService.java | |
| parent | 898d6d964cb3b650b5c9bed2276310547e5455e0 (diff) | |
| parent | 15258ac86bb397206ac44c073baf184ffa0e62f2 (diff) | |
| download | frameworks_base-db3146c039750f68418e0908037a8bed3890913c.zip frameworks_base-db3146c039750f68418e0908037a8bed3890913c.tar.gz frameworks_base-db3146c039750f68418e0908037a8bed3890913c.tar.bz2 | |
am 15258ac8: Fix power manager display wake lock bugs. (DO NOT MERGE)
* commit '15258ac86bb397206ac44c073baf184ffa0e62f2':
Fix power manager display wake lock bugs. (DO NOT MERGE)
Diffstat (limited to 'services/java/com/android/server/power/PowerManagerService.java')
| -rw-r--r-- | services/java/com/android/server/power/PowerManagerService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/java/com/android/server/power/PowerManagerService.java b/services/java/com/android/server/power/PowerManagerService.java index da9548f..134718b 100644 --- a/services/java/com/android/server/power/PowerManagerService.java +++ b/services/java/com/android/server/power/PowerManagerService.java @@ -1135,6 +1135,9 @@ public final class PowerManagerService extends IPowerManager.Stub if (!mSystemReady || mDirty == 0) { return; } + if (!Thread.holdsLock(mLock)) { + Slog.wtf(TAG, "Power manager lock was not held when calling updatePowerStateLocked"); + } // Phase 0: Basic state updates. updateIsPoweredLocked(mDirty); |