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

Commit 629fe737 authored by Chris Li's avatar Chris Li
Browse files

Sync on notifyWakingUp 

Fix: 216284843
Test: pass existing
Change-Id: Icf27f86d27281cf515d3a55f59a5dd7909fccd12
parent f267dc16

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -6624,10 +6624,12 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 




        @Override

        @Override

        public void notifyWakingUp() {

        public void notifyWakingUp() {

            synchronized (mGlobalLock) {

                // Start a transition for waking. This is needed for showWhenLocked activities.

                // Start a transition for waking. This is needed for showWhenLocked activities.

                getTransitionController().requestTransitionIfNeeded(TRANSIT_WAKE, 0 /* flags */,

                getTransitionController().requestTransitionIfNeeded(TRANSIT_WAKE, 0 /* flags */,

                        null /* trigger */, mRootWindowContainer.getDefaultDisplay());

                        null /* trigger */, mRootWindowContainer.getDefaultDisplay());

            }

            }

        }





        @Override

        @Override

        public void registerActivityStartInterceptor(

        public void registerActivityStartInterceptor(