Merge "Fix thread booster" into oc-dev

2017-06-09 23:23:56 +00:00
parent 4f30aa2be8 7e12b6d848
commit 4c1209e00e
1 changed files with 5 additions and 3 deletions
--- a/services/core/java/com/android/server/ThreadPriorityBooster.java
+++ b/services/core/java/com/android/server/ThreadPriorityBooster.java
@@ -43,9 +43,11 @@ public class ThreadPriorityBooster {
        final int tid = myTid();
        final int prevPriority = getThreadPriority(tid);
        final PriorityState state = mThreadState.get();
-        state.prevPriority = prevPriority;
-        if (state.regionCounter == 0 && prevPriority > mBoostToPriority) {
-            setThreadPriority(tid, mBoostToPriority);
+        if (state.regionCounter == 0) {
+            state.prevPriority = prevPriority;
+            if (prevPriority > mBoostToPriority) {
+                setThreadPriority(tid, mBoostToPriority);
+            }
        }
        state.regionCounter++;
        if (LockGuard.ENABLED) {