Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chavi Weingarten
2019-06-18 19:58:49 +00:00
committed by Android (Google) Code Review
parent c8dca90aa7 a13051f214
commit 68423d1491
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/RecentTasks.java
View File

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