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

2023-06-26 08:10:45 +00:00
parent 277bbab150 45301a4d54
commit 4bc363b907
1 changed files with 4 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -2666,7 +2666,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);