Merge "Fix thread booster" into oc-dev
diff --git a/services/core/java/com/android/server/ThreadPriorityBooster.java b/services/core/java/com/android/server/ThreadPriorityBooster.java
index 0dfecc0..cc9ac0d 100644
--- a/services/core/java/com/android/server/ThreadPriorityBooster.java
+++ b/services/core/java/com/android/server/ThreadPriorityBooster.java
@@ -43,9 +43,11 @@
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) {