Merge "Skip null surface when validating transition" into udc-dev am: 4bc363b907 am: a56a9d9a56 am: 83ce7a32ab

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

Change-Id: If701ea59bff81644826ab0ba7e7f8dc220d54a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-06-26 10:19:49 +00:00
committed by Automerger Merge Worker

View File

@@ -2674,7 +2674,10 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
mController.mStateValidators.add(() -> { mController.mStateValidators.add(() -> {
for (int i = mTargets.size() - 1; i >= 0; --i) { for (int i = mTargets.size() - 1; i >= 0; --i) {
final ChangeInfo change = mTargets.get(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 Slog.e(TAG, "Force show for visible " + change.mContainer
+ " which may be hidden by transition unexpectedly"); + " which may be hidden by transition unexpectedly");
change.mContainer.getSyncTransaction().show(change.mContainer.mSurfaceControl); change.mContainer.getSyncTransaction().show(change.mContainer.mSurfaceControl);