diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-08-27 13:27:08 -0700 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2009-08-27 13:27:08 -0700 |
| commit | ddfe879b783ad72603308e28e8f683454464684e (patch) | |
| tree | 4011fd9c435bea64f3dd5dc440980fc63a0a4475 /services | |
| parent | 36fc302560fbc6dff3099860356d290d1653371c (diff) | |
| download | frameworks_base-ddfe879b783ad72603308e28e8f683454464684e.zip frameworks_base-ddfe879b783ad72603308e28e8f683454464684e.tar.gz frameworks_base-ddfe879b783ad72603308e28e8f683454464684e.tar.bz2 | |
Don't activate keyguard if screen is turned off while proximity sensor is active.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index 621f497..38df47b 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -949,6 +949,9 @@ class PowerManagerService extends IPowerManager.Stub private void sendNotificationLocked(boolean on, int why) { + if (mProximitySensorActive) { + why = WindowManagerPolicy.OFF_BECAUSE_OF_PROXIMITY_SENSOR; + } if (!on) { mStillNeedSleepNotification = false; } |