Fix PowerMgr NPE on emulator.

Bug: 6313695 Change-Id: Ib12b9102df01603df135cef03fd2a2f6e3634dd1
2012-04-10 15:14:35 -04:00
parent 450c75a59b
commit 0af489568d
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@ -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");
                    }