commit 2874338723f085361f25f6842f7c95add3b93e7a
author Chilun <chilunhuang@google.com> Thu Mar 21 19:51:37 2019 +0800
committer android-build-team Robot <android-build-team-robot@google.com> Thu Mar 21 21:12:43 2019 +0000
tree 7e54a767f04d69d40f743e71d3f18786751bb52c
parent d15b901ad6e27cbdc930305c6463e6efe946f605

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
(cherry picked from commit 5fd56547d0d1e105d930909b1beaf2512a5e0f01)

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 118eb5b..c91ee8e2 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 @@
         @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