Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c479b55a authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

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

parents 7af0c166 4ccbdd17

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

+2 −1
Original line number Diff line number Diff line
@@ -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;

    }