Merge "Added missing mGlobalLock in system server" into qt-dev

This commit is contained in:
Chavi Weingarten
2019-06-18 19:58:49 +00:00
committed by Android (Google) Code Review

View File

@@ -308,12 +308,14 @@ class RecentTasks {
*/ */
@VisibleForTesting @VisibleForTesting
void resetFreezeTaskListReorderingOnTimeout() { void resetFreezeTaskListReorderingOnTimeout() {
synchronized (mService.mGlobalLock) {
final ActivityStack focusedStack = mService.getTopDisplayFocusedStack(); final ActivityStack focusedStack = mService.getTopDisplayFocusedStack();
final TaskRecord topTask = focusedStack != null final TaskRecord topTask = focusedStack != null
? focusedStack.topTask() ? focusedStack.topTask()
: null; : null;
resetFreezeTaskListReordering(topTask); resetFreezeTaskListReordering(topTask);
} }
}
@VisibleForTesting @VisibleForTesting
boolean isFreezeTaskListReorderingSet() { boolean isFreezeTaskListReorderingSet() {