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 
am: 68423d1491

Change-Id: I0881388643f6b87e12ed4833ee79fede4d43b7a6
This commit is contained in:
Chavi Weingarten
2019-06-18 13:23:50 -07:00
committed by android-build-merger
parent 54774cadb0 68423d1491
commit e15fd17d5e
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
void resetFreezeTaskListReorderingOnTimeout() {
final ActivityStack focusedStack = mService.getTopDisplayFocusedStack();
final TaskRecord topTask = focusedStack != null
? focusedStack.topTask()
: null;
resetFreezeTaskListReordering(topTask);
synchronized (mService.mGlobalLock) {
final ActivityStack focusedStack = mService.getTopDisplayFocusedStack();
final TaskRecord topTask = focusedStack != null
? focusedStack.topTask()
: null;
resetFreezeTaskListReordering(topTask);
}
}
@VisibleForTesting