Merge "Fix race condition in WakeLocks."

2011-06-27 14:54:24 -07:00
parent 6d63726290 b5962e73e8
commit da1fa1e42f
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/os/PowerManager.java
+++ b/core/java/android/os/PowerManager.java
@@ -313,8 +313,8 @@ public class PowerManager
         */
        public void release(int flags) {
            synchronized (mToken) {
-                mHandler.removeCallbacks(mReleaser);
                if (!mRefCounted || --mCount == 0) {
+                    mHandler.removeCallbacks(mReleaser);
                    try {
                        mService.releaseWakeLock(mToken, flags);
                    } catch (RemoteException e) {