diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/Transition.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index 5f2d3ca8175b..b7ef5bbf13bd 100644 --- 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); |