diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-04-10 15:14:35 -0400 |
|---|---|---|
| committer | Daniel Sandler <dsandler@android.com> | 2012-04-10 15:15:32 -0400 |
| commit | 0af489568de297fafc1d0e577481181ce3d81d4c (patch) | |
| tree | d784073cd7fa8a33ee6e280674ca51149ad29076 /services/java/com/android/server/PowerManagerService.java | |
| parent | 450c75a59bf510ef97bfc208ee7c7660fdb73afa (diff) | |
Fix PowerMgr NPE on emulator.
Bug: 6313695
Change-Id: Ib12b9102df01603df135cef03fd2a2f6e3634dd1
Diffstat (limited to 'services/java/com/android/server/PowerManagerService.java')
| -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 bebce7e4525c..2d2a88113b34 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"); } |