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

Merge "Fix logic for power button overridding the "wait for prox negative state" after a call"

Browse Source
This commit is contained in:
Mike Lockwood
2011-09-02 10:04:11 -07:00
committed by Android (Google) Code Review
parent 69a5f6c3e0 db97f60054
commit c458960886
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/PowerManagerService.java
View File

@@ -853,6 +853,14 @@ public class PowerManagerService extends IPowerManager.Stub
if ((wl.flags & PowerManager.ACQUIRE_CAUSES_WAKEUP) != 0) { if ((wl.flags & PowerManager.ACQUIRE_CAUSES_WAKEUP) != 0) {
int oldWakeLockState = mWakeLockState; int oldWakeLockState = mWakeLockState;
mWakeLockState = mLocks.reactivateScreenLocksLocked(); mWakeLockState = mLocks.reactivateScreenLocksLocked();
// Disable proximity sensor if if user presses power key while we are in the
// "waiting for proximity sensor to go negative" state.
if ((mWakeLockState & SCREEN_ON_BIT) != 0
&& mProximitySensorActive && mProximityWakeLockCount == 0) {
mProximitySensorActive = false;
}
if (mSpew) { if (mSpew) {
Slog.d(TAG, "wakeup here mUserState=0x" + Integer.toHexString(mUserState) Slog.d(TAG, "wakeup here mUserState=0x" + Integer.toHexString(mUserState)
+ " mWakeLockState=0x" + " mWakeLockState=0x"