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

Commit b58580a5 authored by Qijing Yao's avatar Qijing Yao Committed by Automerger Merge Worker
Browse files

Merge "Make sure topActivity always retrieves focus when move task to back"... 

Merge "Make sure topActivity always retrieves focus when move task to back" into udc-dev am: a38aeb81

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22473262



Change-Id: Iae4432c6b783b7fc3d2069be4ed7adfd4c14dcd2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31812c30 a38aeb81

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

+1 −0
Original line number Diff line number Diff line
@@ -5684,6 +5684,7 @@ class Task extends TaskFragment { 
            // Usually resuming a top activity triggers the next app transition, but nothing's got

            // resumed in this case, so we need to execute it explicitly.

            mDisplayContent.executeAppTransition();

            mDisplayContent.setFocusedApp(topActivity);

        } else {

            mRootWindowContainer.resumeFocusedTasksTopActivities();

        }