diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-09-02 10:04:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-02 10:04:11 -0700 |
| commit | c458960886322a4403a1deb89ffbe3a24f9ee470 (patch) | |
| tree | 1bbd881b1301acbf57280148ed2a781b6242196b /services/java | |
| parent | 69a5f6c3e04aa0f3f87eed7578a32782c97bd48f (diff) | |
| parent | db97f60054b6011fbcc1baf29a68b940b53046c0 (diff) | |
| download | frameworks_base-c458960886322a4403a1deb89ffbe3a24f9ee470.zip frameworks_base-c458960886322a4403a1deb89ffbe3a24f9ee470.tar.gz frameworks_base-c458960886322a4403a1deb89ffbe3a24f9ee470.tar.bz2 | |
Merge "Fix logic for power button overridding the "wait for prox negative state" after a call"
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index cbd986f..bbc26d6 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -853,6 +853,14 @@ public class PowerManagerService extends IPowerManager.Stub if ((wl.flags & PowerManager.ACQUIRE_CAUSES_WAKEUP) != 0) { int oldWakeLockState = mWakeLockState; 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) { Slog.d(TAG, "wakeup here mUserState=0x" + Integer.toHexString(mUserState) + " mWakeLockState=0x" |