Merge "Defer creation of input sink surface until sync completes" into tm-qpr-dev am: 6d4dc22840

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

Change-Id: I4200abeb99ee756655369291a6635cccfffc3877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2022-12-06 12:12:17 +00:00
committed by Automerger Merge Worker

View File

@@ -7447,8 +7447,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
} else if (!show && mLastSurfaceShowing) {
getSyncTransaction().hide(mSurfaceControl);
}
if (show) {
mActivityRecordInputSink.applyChangesToSurfaceIfChanged(getSyncTransaction());
// Input sink surface is not a part of animation, so just apply in a steady state
// (non-sync) with pending transaction.
if (show && mSyncState == SYNC_STATE_NONE) {
mActivityRecordInputSink.applyChangesToSurfaceIfChanged(getPendingTransaction());
}
}
if (mThumbnail != null) {