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

Commit 62610201 authored by Toshiki Kikuchi's avatar Toshiki Kikuchi Committed by Automerger Merge Worker
Browse files

Merge "Skip starting no-longer-collecting transition" into udc-dev am: 11797fab 

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



Change-Id: I23e526b5ba9eccac78da2cf14626e35b5c0f0e3d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 46521597 11797fab

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

+7 −0
Original line number Diff line number Diff line
@@ -315,6 +315,13 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
                    }

                    transition = mTransitionController.createTransition(type);

                }

                if (!transition.isCollecting()) {

                    Slog.e(TAG, "Trying to start a transition that isn't collecting. This probably"

                            + " means Shell took too long to respond to a request. WM State may be"

                            + " incorrect now, please file a bug");

                    applyTransaction(wct, -1 /*syncId*/, null /*transition*/, caller);

                    return transition.getToken();

                }

                transition.start();

                transition.mLogger.mStartWCT = wct;

                applyTransaction(wct, -1 /*syncId*/, transition, caller);