Merge "Check proximity detector before powering off." into jb-mr1-dev

Author: Craig Mautner

services/java/com/android/server/power/PowerManagerService.java

@@ -1136,7 +1136,8 @@ private boolean updateWakefulnessLocked(int dirty) {
     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;
     }