diff options
author | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | 2009-11-15 13:42:40 -0800 |
---|---|---|
committer | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | 2009-11-15 13:42:40 -0800 |
commit | e5d2c2284da5b0de3db1798b595bf580c1905d00 (patch) | |
tree | 8d02f9d48e81fd34582e054b9fd45dbee1668796 | |
parent | 44851cfd63ab4a6a601b9ee8489510a46814b6ab (diff) | |
parent | 04c585e3bcb75c85ceeacf2fd94ea4194f332404 (diff) | |
download | base-e5d2c2284da5b0de3db1798b595bf580c1905d00.tar.gz |
Merge commit '04c585e3bcb75c85ceeacf2fd94ea4194f332404' into eclair-sholes-release
-rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index 830f27a20044..bde03f3f9b5b 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -185,6 +185,7 @@ class PowerManagerService extends IPowerManager.Stub private UnsynchronizedWakeLock mStayOnWhilePluggedInScreenDimLock; private UnsynchronizedWakeLock mStayOnWhilePluggedInPartialLock; private UnsynchronizedWakeLock mPreventScreenOnPartialLock; + private UnsynchronizedWakeLock mProximityPartialLock; private HandlerThread mHandlerThread; private Handler mHandler; private TimeoutTask mTimeoutTask = new TimeoutTask(); @@ -283,6 +284,7 @@ class PowerManagerService extends IPowerManager.Stub IBinder mToken; int mCount = 0; boolean mRefCounted; + boolean mHeld; UnsynchronizedWakeLock(int flags, String tag, boolean refCounted) { mFlags = flags; @@ -297,6 +299,7 @@ class PowerManagerService extends IPowerManager.Stub try { PowerManagerService.this.acquireWakeLockLocked(mFlags, mToken, MY_UID, mTag); + mHeld = true; } finally { Binder.restoreCallingIdentity(ident); } @@ -306,15 +309,21 @@ class PowerManagerService extends IPowerManager.Stub public void release() { if (!mRefCounted || --mCount == 0) { PowerManagerService.this.releaseWakeLockLocked(mToken, false); + mHeld = false; } if (mCount < 0) { throw new RuntimeException("WakeLock under-locked " + mTag); } } + public boolean isHeld() + { + return mHeld; + } + public String toString() { return "UnsynchronizedWakeLock(mFlags=0x" + Integer.toHexString(mFlags) - + " mCount=" + mCount + ")"; + + " mCount=" + mCount + " mHeld=" + mHeld + ")"; } } @@ -443,6 +452,8 @@ class PowerManagerService extends IPowerManager.Stub PowerManager.PARTIAL_WAKE_LOCK, "StayOnWhilePluggedIn Partial", false); mPreventScreenOnPartialLock = new UnsynchronizedWakeLock( PowerManager.PARTIAL_WAKE_LOCK, "PreventScreenOn Partial", false); + mProximityPartialLock = new UnsynchronizedWakeLock( + PowerManager.PARTIAL_WAKE_LOCK, "Proximity Partial", false); mScreenOnIntent = new Intent(Intent.ACTION_SCREEN_ON); mScreenOnIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); @@ -907,6 +918,7 @@ class PowerManagerService extends IPowerManager.Stub pw.println(" mStayOnWhilePluggedInScreenDimLock=" + mStayOnWhilePluggedInScreenDimLock); pw.println(" mStayOnWhilePluggedInPartialLock=" + mStayOnWhilePluggedInPartialLock); pw.println(" mPreventScreenOnPartialLock=" + mPreventScreenOnPartialLock); + pw.println(" mProximityPartialLock=" + mProximityPartialLock); pw.println(" mProximityWakeLockCount=" + mProximityWakeLockCount); pw.println(" mProximitySensorEnabled=" + mProximitySensorEnabled); pw.println(" mProximitySensorActive=" + mProximitySensorActive); @@ -1953,6 +1965,9 @@ class PowerManagerService extends IPowerManager.Stub proximityChangedLocked(mProximityPendingValue == 1); mProximityPendingValue = -1; } + if (mProximityPartialLock.isHeld()) { + mProximityPartialLock.release(); + } } } }; @@ -2414,6 +2429,9 @@ class PowerManagerService extends IPowerManager.Stub try { mSensorManager.unregisterListener(mProximityListener); mHandler.removeCallbacks(mProximityTask); + if (mProximityPartialLock.isHeld()) { + mProximityPartialLock.release(); + } mProximitySensorEnabled = false; } finally { Binder.restoreCallingIdentity(identity); @@ -2480,6 +2498,7 @@ class PowerManagerService extends IPowerManager.Stub long timeSinceLastEvent = milliseconds - mLastProximityEventTime; mLastProximityEventTime = milliseconds; mHandler.removeCallbacks(mProximityTask); + boolean proximityTaskQueued = false; // compare against getMaximumRange to support sensors that only return 0 or 1 boolean active = (distance >= 0.0 && distance < PROXIMITY_THRESHOLD && @@ -2492,11 +2511,21 @@ class PowerManagerService extends IPowerManager.Stub // enforce delaying atleast PROXIMITY_SENSOR_DELAY before processing mProximityPendingValue = (active ? 1 : 0); mHandler.postDelayed(mProximityTask, PROXIMITY_SENSOR_DELAY - timeSinceLastEvent); + proximityTaskQueued = true; } else { // process the value immediately mProximityPendingValue = -1; proximityChangedLocked(active); } + + // update mProximityPartialLock state + boolean held = mProximityPartialLock.isHeld(); + if (!held && proximityTaskQueued) { + // hold wakelock until mProximityTask runs + mProximityPartialLock.acquire(); + } else if (held && !proximityTaskQueued) { + mProximityPartialLock.release(); + } } } |