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

Commit 3bf928d5 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Fix PowerMgr NPE on emulator."

parents 8d33d39d 0af48956

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

+1 −1
Original line number Diff line number Diff line
@@ -1795,7 +1795,7 @@ public class PowerManagerService extends IPowerManager.Stub 
            final boolean stateChanged = mPowerState != newState;



            if (stateChanged && reason == WindowManagerPolicy.OFF_BECAUSE_OF_TIMEOUT) {

                if (mPolicy.isScreenSaverEnabled()) {

                if (mPolicy != null && mPolicy.isScreenSaverEnabled()) {

                    if (mSpew) {

                        Slog.d(TAG, "setPowerState: running screen saver instead of turning off screen");

                    }