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

This commit is contained in:
Craig Mautner
2012-06-18 18:01:53 -07:00
committed by Android (Google) Code Review

View File

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