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

Commit 151e2053 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "When doing activity->activity transfer, use abort instead of finish"... 

Merge "When doing activity->activity transfer, use abort instead of finish" into tm-dev am: 25616b09

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

Change-Id: I44ebf150d81d133552bc781921009168ed432de9
parents 4316da7c 25616b09

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java

+6 −2
Original line number Diff line number Diff line
@@ -363,7 +363,9 @@ public class Transitions implements RemoteCallable<Transitions> { 
            return;

        }



        // apply transfer starting window directly if there is no other task change.

        // apply transfer starting window directly if there is no other task change. Since this

        // is an activity->activity situation, we can detect it by selecting transitions with only

        // 2 changes where neither are tasks and one is a starting-window recipient.

        final int changeSize = info.getChanges().size();

        if (changeSize == 2) {

            boolean nonTaskChange = true;
@@ -380,7 +382,9 @@ public class Transitions implements RemoteCallable<Transitions> { 
            }

            if (nonTaskChange && transferStartingWindow) {

                t.apply();

                onFinish(transitionToken, null /* wct */, null /* wctCB */);

                // Treat this as an abort since we are bypassing any merge logic and effectively

                // finishing immediately.

                onAbort(transitionToken);

                return;

            }

        }