diff options
| author | Steve Kondik <shade@chemlab.org> | 2010-12-05 18:53:54 -0500 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-12-05 18:53:54 -0500 |
| commit | 42b7da86499e4b36ed2343618abf4b18e3b6f117 (patch) | |
| tree | 49fbfbdd599a33b46541f2e6e688e4dc3a0bca42 | |
| parent | 54a2f4584d32d673490a4ca00602f838ba531041 (diff) | |
| download | frameworks_base-42b7da86499e4b36ed2343618abf4b18e3b6f117.zip frameworks_base-42b7da86499e4b36ed2343618abf4b18e3b6f117.tar.gz frameworks_base-42b7da86499e4b36ed2343618abf4b18e3b6f117.tar.bz2 | |
Fix NPE when checking TORCH_STATE on first boot.
Change-Id: I24fa8e62c9a2bbac693ff9825988e04384dd6d75
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
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(); |