Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fd56547 authored by Chilun's avatar Chilun
Browse files

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
parent 70254011

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

+4 −2
Original line number Diff line number Diff line
@@ -6493,9 +6493,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        @Override

        public boolean startHomeOnDisplay(int userId, String reason, int displayId,

                boolean fromHomeKey) {

            synchronized (mGlobalLock) {

                return mRootActivityContainer.startHomeOnDisplay(userId, reason, displayId,

                        fromHomeKey);

            }

        }



        @Override

        public boolean startHomeOnAllDisplays(int userId, String reason) {