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

Merge "More paths for turning on screen immediately." into jb-dev

Browse Source
This commit is contained in:
Craig Mautner
2012-06-18 18:01:53 -07:00
committed by Android (Google) Code Review
parent 56bb344ccf 75fc9de258
commit 89f5a4624b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2115,6 +2115,10 @@ public class PowerManagerService extends IPowerManager.Stub
brightness = mScreenBrightnessDim; brightness = mScreenBrightnessDim;
} }
} }
if (mWaitingForFirstLightSensor && (newState & SCREEN_ON_BIT) != 0) {
steps = IMMEDIATE_ANIM_STEPS;
}
long identity = Binder.clearCallingIdentity(); long identity = Binder.clearCallingIdentity();
try { try {
mBatteryStats.noteScreenBrightness(brightness); mBatteryStats.noteScreenBrightness(brightness);
@@ -3357,6 +3361,7 @@ public class PowerManagerService extends IPowerManager.Stub
} }
SensorEventListener mLightListener = new SensorEventListener() { SensorEventListener mLightListener = new SensorEventListener() {
@Override
public void onSensorChanged(SensorEvent event) { public void onSensorChanged(SensorEvent event) {
if (mDebugLightSensor) { if (mDebugLightSensor) {
Slog.d(TAG, "onSensorChanged: light value: " + event.values[0]); Slog.d(TAG, "onSensorChanged: light value: " + event.values[0]);
@@ -3367,12 +3372,16 @@ public class PowerManagerService extends IPowerManager.Stub
return; return;
} }
handleLightSensorValue((int)event.values[0], mWaitingForFirstLightSensor); handleLightSensorValue((int)event.values[0], mWaitingForFirstLightSensor);
if (mWaitingForFirstLightSensor) { if (mWaitingForFirstLightSensor && !mPreparingForScreenOn) {
if (mDebugLightAnimation) {
Slog.d(TAG, "onSensorChanged: Clearing mWaitingForFirstLightSensor.");
}
mWaitingForFirstLightSensor = false; mWaitingForFirstLightSensor = false;
} }
} }
} }
@Override
public void onAccuracyChanged(Sensor sensor, int accuracy) { public void onAccuracyChanged(Sensor sensor, int accuracy) {
// ignore // ignore
} }