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

Commit d8938e51 authored by Yunfan Chen's avatar Yunfan Chen Committed by Automerger Merge Worker
Browse files

Merge "Collect change before starting transition" into udc-dev am: 793951c7... 

Merge "Collect change before starting transition" into udc-dev am: 793951c7 am: 664ff442 am: c76ee3c6

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



Change-Id: I79c136385d95d544ed955dfc1277783353571f2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8166377f c76ee3c6

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

+2 −1
Original line number Diff line number Diff line
@@ -1159,9 +1159,10 @@ class ActivityClientController extends IActivityClientController.Stub { 
            }

            return;

        }

        transition.collect(topFocusedRootTask);

        executeMultiWindowFullscreenRequest(fullscreenRequest, topFocusedRootTask);

        r.mTransitionController.requestStartTransition(transition, topFocusedRootTask,

                null /* remoteTransition */, null /* displayChange */);

        executeMultiWindowFullscreenRequest(fullscreenRequest, topFocusedRootTask);

        transition.setReady(topFocusedRootTask, true);

    }