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

Commit 66d544f1 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Skip config-at-end sync if activity removed" into main

parents 8e7dbf73 e0abcf0b

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

+5 −0
Original line number Diff line number Diff line
@@ -1626,6 +1626,11 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        for (int i = 0; i < mConfigAtEndActivities.size(); ++i) {

            final ActivityRecord target = mConfigAtEndActivities.get(i);

            final SurfaceControl targetLeash = target.getSurfaceControl();

            if (targetLeash == null) {

                // activity may have been removed. In this case, no need to sync, just update state.

                target.resumeConfigurationDispatch();

                continue;

            }

            if (target.getSyncGroup() == null || target.getSyncGroup().isIgnoring(target)) {

                if (syncId < 0) {

                    final BLASTSyncEngine.SyncGroup sg = mSyncEngine.prepareSyncSet(