diff options
| author | 2019-03-21 19:51:37 +0800 | |
|---|---|---|
| committer | 2019-03-21 20:04:47 +0800 | |
| commit | 5fd56547d0d1e105d930909b1beaf2512a5e0f01 (patch) | |
| tree | 4ef7cba3c57dc0a0d0a93574c4b0e34ae062a391 | |
| parent | 702540117f84bba31f5c58546c1ecceced5a0e22 (diff) | |
Add missed lock for startHomeOnDisplay
Missing mGlobalLock while calling to RootActivityContainer.
Bug: 128955176
Bug: 127348870
Test: atest ActivityManagerMultiDisplayTests
Test: atest ActivityManagerActivityVisibilityTests
Test: atest ActivityManagerSplitScreenTests#testMinimizeAndUnminimizeThenGoingHome
Test: atest ActivityMetricsLoggerTests#testAppHotLaunchSetsWaitResultDelayData
Change-Id: I1fefaabc0c5ad2b38be4bd3b02b998cad93cdd20
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityTaskManagerService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 118eb5bea602..c91ee8e2f286 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -6493,8 +6493,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { @Override public boolean startHomeOnDisplay(int userId, String reason, int displayId, boolean fromHomeKey) { - return mRootActivityContainer.startHomeOnDisplay(userId, reason, displayId, - fromHomeKey); + synchronized (mGlobalLock) { + return mRootActivityContainer.startHomeOnDisplay(userId, reason, displayId, + fromHomeKey); + } } @Override |