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

Commit bc4aef61 authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Update ActivityRecordInputSink using the pending transaction" into udc-dev

parents 576f1075 806927c6
Loading
Loading
Loading
Loading
+5 −6
Original line number Diff line number Diff line
@@ -1240,16 +1240,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.