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

Commit 304c9ad3 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I4200abeb99ee756655369291a6635cccfffc3877
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ebf91d3e 6d4dc228

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

+4 −2
Original line number Diff line number Diff line
@@ -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) {