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

am 0cb3f587: am 0d72f7e9: Fix a race condition that could result in the screen being forced off indefinitely after a phone call.

Browse Source 
Merge commit '0cb3f58741efa2b2b7477cbae973a29e614c62e8' into eclair-mr2-plus-aosp

* commit '0cb3f58741efa2b2b7477cbae973a29e614c62e8':
  Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
This commit is contained in:
Mike Lockwood
2009-11-06 10:17:14 -08:00
committed by Android Git Automerger
parent 414628c55a 0cb3f58741
commit bd2473a9aa
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2349,11 +2349,9 @@ class PowerManagerService extends IPowerManager.Stub
} finally { } finally {
Binder.restoreCallingIdentity(identity); Binder.restoreCallingIdentity(identity);
} }
synchronized (mLocks) { if (mProximitySensorActive) {
if (mProximitySensorActive) { mProximitySensorActive = false;
mProximitySensorActive = false; forceUserActivityLocked();
forceUserActivityLocked();
}
} }
} }
@@ -2361,6 +2359,10 @@ class PowerManagerService extends IPowerManager.Stub
if (mSpew) { if (mSpew) {
Log.d(TAG, "proximityChangedLocked, active: " + active); Log.d(TAG, "proximityChangedLocked, active: " + active);
} }
if (mProximityCount <= 0) {
Log.d(TAG, "Ignoring proximity change after last proximity lock is released");
return;
}
if (active) { if (active) {
goToSleepLocked(SystemClock.uptimeMillis()); goToSleepLocked(SystemClock.uptimeMillis());
mProximitySensorActive = true; mProximitySensorActive = true;