diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-10-02 19:11:19 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2012-10-02 19:11:19 -0700 |
| commit | a4d8204e3068b9d8d6908d4cf3440e81967867a3 (patch) | |
| tree | 5a3e01a517ca780549121d43564a76655c45ede2 /services/java/com/android/server/power/PowerManagerService.java | |
| parent | cb882f90e4305bd40d7219707bc1796319e9c80e (diff) | |
| download | frameworks_base-a4d8204e3068b9d8d6908d4cf3440e81967867a3.zip frameworks_base-a4d8204e3068b9d8d6908d4cf3440e81967867a3.tar.gz frameworks_base-a4d8204e3068b9d8d6908d4cf3440e81967867a3.tar.bz2 | |
Fix some synchronization issues in BatteryService.
Some of the BatteryService state was being locked
sometimes and it wasn't at all consistent.
Bug: 7158734
Change-Id: I46e75f66fde92c5a577a80a6bd99c9573066f3c1
Diffstat (limited to 'services/java/com/android/server/power/PowerManagerService.java')
| -rw-r--r-- | services/java/com/android/server/power/PowerManagerService.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/services/java/com/android/server/power/PowerManagerService.java b/services/java/com/android/server/power/PowerManagerService.java index 664125a..a782d88 100644 --- a/services/java/com/android/server/power/PowerManagerService.java +++ b/services/java/com/android/server/power/PowerManagerService.java @@ -1014,7 +1014,12 @@ public final class PowerManagerService extends IPowerManager.Stub private void updateIsPoweredLocked(int dirty) { if ((dirty & DIRTY_BATTERY_STATE) != 0) { boolean wasPowered = mIsPowered; - mIsPowered = mBatteryService.isPowered(); + mIsPowered = mBatteryService.isPowered(BatteryManager.BATTERY_PLUGGED_ANY); + + if (DEBUG) { + Slog.d(TAG, "updateIsPoweredLocked: wasPowered=" + wasPowered + + ", mIsPowered=" + mIsPowered); + } if (wasPowered != mIsPowered) { mDirty |= DIRTY_IS_POWERED; |