drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 95f600b5: Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread

Browse Source 
Merge commit '95f600b55f617fcc94985fee07927aff48160362' into gingerbread-plus-aosp

* commit '95f600b55f617fcc94985fee07927aff48160362':
  Fix NPE in PowerManagerService on boot, if some settings are corrupted.
This commit is contained in:
Amith Yamasani
2010-09-22 16:35:11 -07:00
committed by Android Git Automerger
parent 11746caaa8 95f600b55f
commit abdd2c7f03
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/java/com/android/server/PowerManagerService.java
View File

@ -25,6 +25,7 @@ import android.app.IActivityManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.ContentQueryMap; import android.content.ContentQueryMap;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
@ -36,6 +37,7 @@ import android.hardware.Sensor;
import android.hardware.SensorEvent; import android.hardware.SensorEvent;
import android.hardware.SensorEventListener; import android.hardware.SensorEventListener;
import android.hardware.SensorManager; import android.hardware.SensorManager;
import android.os.BatteryManager;
import android.os.BatteryStats; import android.os.BatteryStats;
import android.os.Binder; import android.os.Binder;
import android.os.Environment; import android.os.Environment;
@ -109,6 +111,9 @@ class PowerManagerService extends IPowerManager.Stub
// Cached secure settings; see updateSettingsValues() // Cached secure settings; see updateSettingsValues()
private int mShortKeylightDelay = SHORT_KEYLIGHT_DELAY_DEFAULT; private int mShortKeylightDelay = SHORT_KEYLIGHT_DELAY_DEFAULT;
// Default timeout for screen off, if not found in settings database = 15 seconds.
private static final int DEFAULT_SCREEN_OFF_TIMEOUT = 15000;
// flags for setPowerState // flags for setPowerState
private static final int SCREEN_ON_BIT = 0x00000001; private static final int SCREEN_ON_BIT = 0x00000001;
private static final int SCREEN_BRIGHT_BIT = 0x00000002; private static final int SCREEN_BRIGHT_BIT = 0x00000002;
@ -411,24 +416,28 @@ class PowerManagerService extends IPowerManager.Stub
} }
private class SettingsObserver implements Observer { private class SettingsObserver implements Observer {
private int getInt(String name) { private int getInt(String name, int defValue) {
return mSettings.getValues(name).getAsInteger(Settings.System.VALUE); ContentValues values = mSettings.getValues(name);
Integer iVal = values != null ? values.getAsInteger(Settings.System.VALUE) : null;
return iVal != null ? iVal : defValue;
} }
public void update(Observable o, Object arg) { public void update(Observable o, Object arg) {
synchronized (mLocks) { synchronized (mLocks) {
// STAY_ON_WHILE_PLUGGED_IN // STAY_ON_WHILE_PLUGGED_IN, default to when plugged into AC
mStayOnConditions = getInt(STAY_ON_WHILE_PLUGGED_IN); mStayOnConditions = getInt(STAY_ON_WHILE_PLUGGED_IN,
BatteryManager.BATTERY_PLUGGED_AC);
updateWakeLockLocked(); updateWakeLockLocked();
// SCREEN_OFF_TIMEOUT // SCREEN_OFF_TIMEOUT, default to 15 seconds
mScreenOffTimeoutSetting = getInt(SCREEN_OFF_TIMEOUT); mScreenOffTimeoutSetting = getInt(SCREEN_OFF_TIMEOUT, DEFAULT_SCREEN_OFF_TIMEOUT);
// DIM_SCREEN // DIM_SCREEN
//mDimScreen = getInt(DIM_SCREEN) != 0; //mDimScreen = getInt(DIM_SCREEN) != 0;
// SCREEN_BRIGHTNESS_MODE // SCREEN_BRIGHTNESS_MODE, default to manual
setScreenBrightnessMode(getInt(SCREEN_BRIGHTNESS_MODE)); setScreenBrightnessMode(getInt(SCREEN_BRIGHTNESS_MODE,
Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL));
// recalculate everything // recalculate everything
setScreenOffTimeoutsLocked(); setScreenOffTimeoutsLocked();