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

Commit 925bc215 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [6795681, 6795720] into qt-release 

Change-Id: Ifda28309d1b7d2754011fed42108afbfda4c565a
parents d15b901a 28743387

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) {