diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-04-11 07:03:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-11 07:03:00 -0700 |
| commit | 3bf928d51ec9ce53d1ebeb53c7265980e349e444 (patch) | |
| tree | f5cfcd74ac14c6b14abadca10e1ac619455a9578 | |
| parent | 8d33d39d68d46af758143a56c89322360cbbada2 (diff) | |
| parent | 0af489568de297fafc1d0e577481181ce3d81d4c (diff) | |
| download | frameworks_base-3bf928d51ec9ce53d1ebeb53c7265980e349e444.zip frameworks_base-3bf928d51ec9ce53d1ebeb53c7265980e349e444.tar.gz frameworks_base-3bf928d51ec9ce53d1ebeb53c7265980e349e444.tar.bz2 | |
Merge "Fix PowerMgr NPE on emulator."
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index bebce7e..2d2a881 100644 --- 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"); } |