From 4ccbdd17704e8837f8a8fcc152e8de499b504ff6 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Tue, 28 Aug 2012 17:12:52 -0700 Subject: Check proximity detector before powering off. Do not automatically power off if the proximity detector wakelock is active. Fixes bug 7047455. Change-Id: I44e30bf388292e5c476dfb5d0de9226d21853e4d --- services/java/com/android/server/power/PowerManagerService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'services/java') 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; } -- cgit v1.2.3-59-g8ed1b