Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2445880c: am ba8a5413: Fix missing lock in power manager.

Browse Source 
* commit '2445880c5cb6504455bd5cae38a850744f4804be':
  Fix missing lock in power manager.
This commit is contained in:
Jeff Brown
2013-07-19 13:37:25 -07:00
committed by Android Git Automerger
parent 70eac41f70 2445880c5c
commit 7afdf7f051
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/java/com/android/server/power/PowerManagerService.java
View File

@@ -1702,24 +1702,30 @@ public final class PowerManagerService extends IPowerManager.Stub
new DisplayPowerController.Callbacks() { new DisplayPowerController.Callbacks() {
@Override @Override
public void onStateChanged() { public void onStateChanged() {
mDirty |= DIRTY_ACTUAL_DISPLAY_POWER_STATE_UPDATED; synchronized (mLock) {
updatePowerStateLocked(); mDirty |= DIRTY_ACTUAL_DISPLAY_POWER_STATE_UPDATED;
updatePowerStateLocked();
}
} }
@Override @Override
public void onProximityPositive() { public void onProximityPositive() {
mProximityPositive = true; synchronized (mLock) {
mDirty |= DIRTY_PROXIMITY_POSITIVE; mProximityPositive = true;
updatePowerStateLocked(); mDirty |= DIRTY_PROXIMITY_POSITIVE;
updatePowerStateLocked();
}
} }
@Override @Override
public void onProximityNegative() { public void onProximityNegative() {
mProximityPositive = false; synchronized (mLock) {
mDirty |= DIRTY_PROXIMITY_POSITIVE; mProximityPositive = false;
userActivityNoUpdateLocked(SystemClock.uptimeMillis(), mDirty |= DIRTY_PROXIMITY_POSITIVE;
PowerManager.USER_ACTIVITY_EVENT_OTHER, 0, Process.SYSTEM_UID); userActivityNoUpdateLocked(SystemClock.uptimeMillis(),
updatePowerStateLocked(); PowerManager.USER_ACTIVITY_EVENT_OTHER, 0, Process.SYSTEM_UID);
updatePowerStateLocked();
}
} }
}; };