Merge "Fix PowerMgr NPE on emulator."

2012-04-11 07:03:00 -07:00
parent 8d33d39d68 0af489568d
commit 3bf928d51e
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");
                    }