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

Commit 167b2c11 authored by Vishnu Nair's avatar Vishnu Nair Committed by Automerger Merge Worker
Browse files

DO NOT MERGE: Update ActivityRecordInputSink using the pending transaction am:... 

DO NOT MERGE: Update ActivityRecordInputSink using the pending transaction am: 806927c6 am: dae840d1

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



Change-Id: I2739662021e0afb2b17acb22a963fe2db1924f78
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35086a62 dae840d1

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

+5 −6
Original line number Diff line number Diff line
@@ -1291,16 +1291,15 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        }



        // Update the input-sink (touch-blocking) state now that the animation is finished.

        SurfaceControl.Transaction inputSinkTransaction = null;

        boolean scheduleAnimation = false;

        for (int i = 0; i < mParticipants.size(); ++i) {

            final ActivityRecord ar = mParticipants.valueAt(i).asActivityRecord();

            if (ar == null || !ar.isVisible() || ar.getParent() == null) continue;

            if (inputSinkTransaction == null) {

                inputSinkTransaction = ar.mWmService.mTransactionFactory.get();

            scheduleAnimation = true;

            ar.mActivityRecordInputSink.applyChangesToSurfaceIfChanged(ar.getPendingTransaction());

        }

            ar.mActivityRecordInputSink.applyChangesToSurfaceIfChanged(inputSinkTransaction);

        }

        if (inputSinkTransaction != null) inputSinkTransaction.apply();

        // To apply pending transactions.

        if (scheduleAnimation) mController.mAtm.mWindowManager.scheduleAnimationLocked();



        // Always schedule stop processing when transition finishes because activities don't

        // stop while they are in a transition thus their stop could still be pending.