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

Commit 3d1cc7b2 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Wrap transition-related queueSyncSet into a helper function" into udc-dev am: ae1ce6e6 

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



Change-Id: Iad126ecfe72042cbdd5175aeaa91dff79bd8d8ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b3acbaba ae1ce6e6

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

+1 −2
Original line number Diff line number Diff line
@@ -1145,8 +1145,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
        if (mService.mWindowManager.mSyncEngine.hasActiveSync()) {

            ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS,

                    "Creating Pending Multiwindow Fullscreen Request: %s", transition);

            mService.mWindowManager.mSyncEngine.queueSyncSet(

                    () -> r.mTransitionController.moveToCollecting(transition),

            r.mTransitionController.queueCollecting(transition,

                    () -> {

                        executeFullscreenRequestTransition(fullscreenRequest, callback, r,

                                transition, true /* queued */);

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

+1 −2
Original line number Diff line number Diff line
@@ -9820,8 +9820,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                scheduleStopForRestartProcess();

            };

            if (mWmService.mSyncEngine.hasActiveSync()) {

                mWmService.mSyncEngine.queueSyncSet(

                        () -> mTransitionController.moveToCollecting(transition), executeRestart);

                mTransitionController.queueCollecting(transition, executeRestart);

            } else {

                mTransitionController.moveToCollecting(transition);

                executeRestart.run();

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

+3 −8
Original line number Diff line number Diff line
@@ -2874,8 +2874,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                final Transition transition = new Transition(TRANSIT_CHANGE, 0 /* flags */,

                        getTransitionController(), mWindowManager.mSyncEngine);

                if (mWindowManager.mSyncEngine.hasActiveSync()) {

                    mWindowManager.mSyncEngine.queueSyncSet(

                            () -> getTransitionController().moveToCollecting(transition),

                    getTransitionController().queueCollecting(transition,

                            () -> {

                                if (!task.getWindowConfiguration().canResizeTask()) {

                                    Slog.w(TAG, "resizeTask not allowed on task=" + task);
@@ -3629,9 +3628,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                    if (transition != null && mWindowManager.mSyncEngine.hasActiveSync()) {

                        ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS,

                                "Creating Pending Pip-Enter: %s", transition);

                        mWindowManager.mSyncEngine.queueSyncSet(

                                () -> getTransitionController().moveToCollecting(transition),

                                enterPipRunnable);

                        getTransitionController().queueCollecting(transition, enterPipRunnable);

                    } else {

                        // Move to collecting immediately to "claim" the sync-engine for this

                        // transition.
@@ -3647,9 +3644,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            if (transition != null && mWindowManager.mSyncEngine.hasActiveSync()) {

                ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS,

                        "Creating Pending Pip-Enter: %s", transition);

                mWindowManager.mSyncEngine.queueSyncSet(

                        () -> getTransitionController().moveToCollecting(transition),

                        enterPipRunnable);

                getTransitionController().queueCollecting(transition, enterPipRunnable);

            } else {

                if (transition != null) {

                    getTransitionController().moveToCollecting(transition);

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

+1 −3
Original line number Diff line number Diff line
@@ -2335,9 +2335,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
                    transition.playNow();

                };

                if (display.mTransitionController.isCollecting()) {

                    mWmService.mSyncEngine.queueSyncSet(

                            () -> display.mTransitionController.moveToCollecting(transition),

                            sendSleepTransition);

                    display.mTransitionController.queueCollecting(transition, sendSleepTransition);

                } else {

                    display.mTransitionController.moveToCollecting(transition);

                    sendSleepTransition.run();

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

+1 −2
Original line number Diff line number Diff line
@@ -5635,8 +5635,7 @@ class Task extends TaskFragment { 
            if (mWmService.mSyncEngine.hasActiveSync()) {

                ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS,

                        "Creating Pending Move-to-back: %s", transition);

                mWmService.mSyncEngine.queueSyncSet(

                        () -> mTransitionController.moveToCollecting(transition),

                mTransitionController.queueCollecting(transition,

                        () -> {

                            // Need to check again since this happens later and the system might

                            // be in a different state.