From 42b7da86499e4b36ed2343618abf4b18e3b6f117 Mon Sep 17 00:00:00 2001
From: Steve Kondik <shade@chemlab.org>
Date: Sun, 5 Dec 2010 18:53:54 -0500
Subject: Fix NPE when checking TORCH_STATE on first boot.

Change-Id: I24fa8e62c9a2bbac693ff9825988e04384dd6d75
---
 services/java/com/android/server/PowerManagerService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index 457622e..e5677bf 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -458,7 +458,8 @@ class PowerManagerService extends IPowerManager.Stub
                  // DIM_SCREEN
                 //mDimScreen = getInt(DIM_SCREEN) != 0;
 
-                mIgnoreLightSensor = (getInt(TORCH_STATE) != 0) && mFlashlightAffectsLightSensor;
+                int torchState = Settings.System.getInt(mContext.getContentResolver(), Settings.System.TORCH_STATE, 0);
+                mIgnoreLightSensor = (torchState > 0) && mFlashlightAffectsLightSensor;
 
                 updateLightSettings();
 
-- 
cgit v1.1