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

am 149f6710: am 17479ebe: Merge change I1bc566a1 into eclair

Browse Source 
Merge commit '149f6710f774f36570de7be8ffa3dd6e8194a11d' into eclair-mr2-plus-aosp

* commit '149f6710f774f36570de7be8ffa3dd6e8194a11d':
  Ignore the light sensor if the screen is turning off.
This commit is contained in:
Mike Lockwood
2009-11-09 16:24:04 -08:00
committed by Android Git Automerger
parent 2c203adbe6 149f6710f7
commit e59631b601
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1440,6 +1440,8 @@ class PowerManagerService extends IPowerManager.Stub
sendNotificationLocked(true, -1); sendNotificationLocked(true, -1);
} }
} else { } else {
// cancel light sensor task
mHandler.removeCallbacks(mAutoBrightnessTask);
mScreenOffTime = SystemClock.elapsedRealtime(); mScreenOffTime = SystemClock.elapsedRealtime();
long identity = Binder.clearCallingIdentity(); long identity = Binder.clearCallingIdentity();
try { try {
@@ -1803,6 +1805,10 @@ class PowerManagerService extends IPowerManager.Stub
} }
} }
private boolean isScreenTurningOffLocked() {
return (mScreenBrightness.animating && mScreenBrightness.targetValue == 0);
}
private void forceUserActivityLocked() { private void forceUserActivityLocked() {
// cancel animation so userActivity will succeed // cancel animation so userActivity will succeed
mScreenBrightness.animating = false; mScreenBrightness.animating = false;
@@ -1863,7 +1869,7 @@ class PowerManagerService extends IPowerManager.Stub
+ " force=" + force); + " force=" + force);
} }
// ignore user activity if we are in the process of turning off the screen // ignore user activity if we are in the process of turning off the screen
if (mScreenBrightness.animating && mScreenBrightness.targetValue == 0) { if (isScreenTurningOffLocked()) {
Log.d(TAG, "ignoring user activity while turning off screen"); Log.d(TAG, "ignoring user activity while turning off screen");
return; return;
} }
@@ -2441,6 +2447,11 @@ class PowerManagerService extends IPowerManager.Stub
SensorEventListener mLightListener = new SensorEventListener() { SensorEventListener mLightListener = new SensorEventListener() {
public void onSensorChanged(SensorEvent event) { public void onSensorChanged(SensorEvent event) {
synchronized (mLocks) { synchronized (mLocks) {
// ignore light sensor while screen is turning off
if (isScreenTurningOffLocked()) {
return;
}
int value = (int)event.values[0]; int value = (int)event.values[0];
long milliseconds = event.timestamp / 1000000; long milliseconds = event.timestamp / 1000000;
if (mDebugLightSensor) { if (mDebugLightSensor) {