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

am bb689496: am 4c7e6900: Make meaning of PowerManager.isScreenOn() more consistent.

Browse Source 
* commit 'bb6894964b30d02dc3545f07b45140646ef17581':
  Make meaning of PowerManager.isScreenOn() more consistent.
This commit is contained in:
Jeff Brown
2014-02-28 09:40:28 +00:00
committed by Android Git Automerger
parent b2334254ef bb6894964b
commit 098bed6f27
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/power/PowerManagerService.java
View File

@ -1590,12 +1590,9 @@ public final class PowerManagerService extends com.android.server.SystemService
| DIRTY_ACTUAL_DISPLAY_POWER_STATE_UPDATED | DIRTY_BOOT_COMPLETED | DIRTY_ACTUAL_DISPLAY_POWER_STATE_UPDATED | DIRTY_BOOT_COMPLETED
| DIRTY_SETTINGS | DIRTY_SCREEN_ON_BLOCKER_RELEASED)) != 0) { | DIRTY_SETTINGS | DIRTY_SCREEN_ON_BLOCKER_RELEASED)) != 0) {
final int newScreenState = getDesiredScreenPowerStateLocked(); final int newScreenState = getDesiredScreenPowerStateLocked();
if (newScreenState != mDisplayPowerRequest.screenState) {
mDisplayPowerRequest.screenState = newScreenState; mDisplayPowerRequest.screenState = newScreenState;
nativeSetPowerState( nativeSetPowerState(isScreenOnLocked(),
mDisplayPowerRequest.wantScreenOnNormal(),
newScreenState == DisplayPowerRequest.SCREEN_STATE_BRIGHT); newScreenState == DisplayPowerRequest.SCREEN_STATE_BRIGHT);
}
int screenBrightness = mScreenBrightnessSettingDefault; int screenBrightness = mScreenBrightnessSettingDefault;
float screenAutoBrightnessAdjustment = 0.0f; float screenAutoBrightnessAdjustment = 0.0f;
@ -1805,11 +1802,15 @@ public final class PowerManagerService extends com.android.server.SystemService
private boolean isScreenOnInternal() { private boolean isScreenOnInternal() {
synchronized (mLock) { synchronized (mLock) {
return !mSystemReady return isScreenOnLocked();
|| mDisplayPowerRequest.wantScreenOnNormal();
} }
} }
private boolean isScreenOnLocked() {
return mWakefulness == WAKEFULNESS_AWAKE
|| mWakefulness == WAKEFULNESS_DREAMING;
}
private void handleBatteryStateChangedLocked() { private void handleBatteryStateChangedLocked() {
mDirty |= DIRTY_BATTERY_STATE; mDirty |= DIRTY_BATTERY_STATE;
updatePowerStateLocked(); updatePowerStateLocked();