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

Commit d9144a1f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Skip null surface when validating transition" into udc-dev am:... 

Merge "Skip null surface when validating transition" into udc-dev am: 4bc363b9 am: a56a9d9a am: 83ce7a32

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



Change-Id: If701ea59bff81644826ab0ba7e7f8dc220d54a65
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a410a7f4 83ce7a32

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

+4 −1
Original line number Diff line number Diff line
@@ -2674,7 +2674,10 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        mController.mStateValidators.add(() -> {

            for (int i = mTargets.size() - 1; i >= 0; --i) {

                final ChangeInfo change = mTargets.get(i);

                if (!change.mContainer.isVisibleRequested()) continue;

                if (!change.mContainer.isVisibleRequested()

                        || change.mContainer.mSurfaceControl == null) {

                    continue;

                }

                Slog.e(TAG, "Force show for visible " + change.mContainer

                        + " which may be hidden by transition unexpectedly");

                change.mContainer.getSyncTransaction().show(change.mContainer.mSurfaceControl);