From 0af489568de297fafc1d0e577481181ce3d81d4c Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@android.com>
Date: Tue, 10 Apr 2012 15:14:35 -0400
Subject: [PATCH] Fix PowerMgr NPE on emulator.

Bug: 6313695
Change-Id: Ib12b9102df01603df135cef03fd2a2f6e3634dd1
---
 services/java/com/android/server/PowerManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index bebce7e4525c9..2d2a88113b340 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");
                     }