diff options
| author | 2012-08-28 17:12:52 -0700 | |
|---|---|---|
| committer | 2012-08-28 17:12:52 -0700 | |
| commit | 4ccbdd17704e8837f8a8fcc152e8de499b504ff6 (patch) | |
| tree | ee965140e17da2ce61ce606f897e0ade541d1a57 /services/java/com | |
| parent | ac137b3211818f9e72f9ffbaf541ad8a1ef27eb1 (diff) | |
Check proximity detector before powering off.
Do not automatically power off if the proximity detector wakelock is
active.
Fixes bug 7047455.
Change-Id: I44e30bf388292e5c476dfb5d0de9226d21853e4d
Diffstat (limited to 'services/java/com')
| -rw-r--r-- | services/java/com/android/server/power/PowerManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/power/PowerManagerService.java b/services/java/com/android/server/power/PowerManagerService.java index 6d681046a2c6..59d09546ce96 100644 --- a/services/java/com/android/server/power/PowerManagerService.java +++ b/services/java/com/android/server/power/PowerManagerService.java @@ -1136,7 +1136,8 @@ public final class PowerManagerService extends IPowerManager.Stub private boolean isItBedTimeYetLocked() { return mBootCompleted && !mStayOn && (mWakeLockSummary - & (WAKE_LOCK_SCREEN_BRIGHT | WAKE_LOCK_SCREEN_DIM)) == 0 + & (WAKE_LOCK_SCREEN_BRIGHT | WAKE_LOCK_SCREEN_DIM + | WAKE_LOCK_PROXIMITY_SCREEN_OFF)) == 0 && (mUserActivitySummary & (USER_ACTIVITY_SCREEN_BRIGHT | USER_ACTIVITY_SCREEN_DIM)) == 0; } |