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

Commit 2ffa09c9 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Set transient launch after collecting for recent at keyguard 

Otherwise RecentsTransitionHandler cannot recognize the transition
for the show-when-locked activity.

Bug: 290558423
Test: Launch a show-when-locked activity.
      Turn off/on screen. Swipe up should back to keyguard.
Change-Id: I41922200bcc855b46c3f49803e02ea5855e84cdd
parent 842ba6f0

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

+3 −0
Original line number Diff line number Diff line
@@ -1591,6 +1591,9 @@ class ActivityStarter { 
        if (forceTransientTransition) {

            transitionController.collect(mLastStartActivityRecord);

            transitionController.collect(mPriorAboveTask);

            // If keyguard is active and occluded, the transient target won't be moved to front

            // to be collected, so set transient again after it is collected.

            transitionController.setTransientLaunch(mLastStartActivityRecord, mPriorAboveTask);

            final DisplayContent dc = mLastStartActivityRecord.getDisplayContent();

            // update wallpaper target to TransientHide

            dc.mWallpaperController.adjustWallpaperWindows();