Merge "Prevent WakeLock count ending up in an incorrect state"

2017-10-03 23:04:57 +00:00
parent a4fabd3ef2 8d475ca058
commit bac998a0cb
1 changed files with 5 additions and 1 deletions
--- a/core/java/android/os/PowerManager.java
+++ b/core/java/android/os/PowerManager.java
@@ -1412,7 +1412,11 @@ public final class PowerManager {
         */
        public void release(int flags) {
            synchronized (mToken) {
-                mInternalCount--;
+                if (mInternalCount > 0) {
+                    // internal count must only be decreased if it is > 0 or state of
+                    // the WakeLock object is broken.
+                    mInternalCount--;
+                }
                if ((flags & RELEASE_FLAG_TIMEOUT) == 0) {
                    mExternalCount--;
                }