Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 14854820: am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread

Browse Source 
Merge commit '14854820eac895a925791fb41ccd330447fd4f02'

* commit '14854820eac895a925791fb41ccd330447fd4f02':
  Add a configuration option to turn on the screen when you unplug the device.
This commit is contained in:
Joe Onorato
2010-10-12 16:27:22 -07:00
committed by Android Git Automerger
parent 5e850b70dc 14854820ea
commit c88a1f955c
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,6 +245,7 @@ class PowerManagerService extends IPowerManager.Stub
private int[] mButtonBacklightValues;
private int[] mKeyboardBacklightValues;
private int mLightSensorWarmupTime;
boolean mUnplugTurnsOnScreen;
private int mWarningSpewThrottleCount;
private long mWarningSpewThrottleTime;
@@ -366,8 +367,12 @@ class PowerManagerService extends IPowerManager.Stub
// user activity when screen was already on.
// temporarily set mUserActivityAllowed to true so this will work
// even when the keyguard is on.
// However, you can also set config_unplugTurnsOnScreen to have it
// turn on. Some devices want this because they don't have a
// charging LED.
synchronized (mLocks) {
if (!wasPowered || (mPowerState & SCREEN_ON_BIT) != 0) {
if (!wasPowered || (mPowerState & SCREEN_ON_BIT) != 0 ||
mUnplugTurnsOnScreen) {
forceUserActivityLocked();
}
}
@@ -526,6 +531,9 @@ class PowerManagerService extends IPowerManager.Stub
Resources resources = mContext.getResources();
mUnplugTurnsOnScreen = resources.getBoolean(
com.android.internal.R.bool.config_unplugTurnsOnScreen);
// read settings for auto-brightness
mUseSoftwareAutoBrightness = resources.getBoolean(
com.android.internal.R.bool.config_automatic_brightness_available);