Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix aborting transition when deliver to top bellow transient launch" into udc-dev am: 69e0c71705

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

Change-Id: Id64e06fd5d2d227ae1384c9dea6400e15793db6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jerry Chang
2023-06-06 07:41:34 +00:00
committed by Automerger Merge Worker
parent 1b7654b696 69e0c71705
commit b304704ab8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -1573,8 +1573,10 @@ class ActivityStarter {
// existence change.
transitionController.collectExistenceChange(started);
} else if (result == START_DELIVERED_TO_TOP && newTransition != null
// An activity has changed order/visibility so this isn't just deliver-to-top
&& mMovedToTopActivity == null) {
// An activity has changed order/visibility or the task is occluded by a transient
// activity, so this isn't just deliver-to-top
&& mMovedToTopActivity == null
&& !transitionController.isTransientHide(startedActivityRootTask)) {
// We just delivered to top, so there isn't an actual transition here.
if (!forceTransientTransition) {
newTransition.abort();