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

Commit efe599ed 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 

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



Change-Id: If5cb7f623f1e1dddeb6a2659629e51de0f859d40
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5920afbf 793951c7

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

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

            }

            return;

            return;

        }

        }

        transition.collect(topFocusedRootTask);

        executeMultiWindowFullscreenRequest(fullscreenRequest, topFocusedRootTask);

        r.mTransitionController.requestStartTransition(transition, topFocusedRootTask,

        r.mTransitionController.requestStartTransition(transition, topFocusedRootTask,

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

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

        executeMultiWindowFullscreenRequest(fullscreenRequest, topFocusedRootTask);

        transition.setReady(topFocusedRootTask, true);

        transition.setReady(topFocusedRootTask, true);

    }

    }