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

Commit c2bac08f authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Prevent exception when quick switching between two split pairs" into... 

Merge "Prevent exception when quick switching between two split pairs" into udc-dev am: 26d5493e am: 71fe404f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23792388



Change-Id: If3b1a1a4bef71e51c70d072f9f4c5c6a03ea78ad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d8cb90f0 71fe404f

quickstep/src/com/android/quickstep/TaskViewUtils.java

+4 −6
Original line number Diff line number Diff line
@@ -473,16 +473,14 @@ public final class TaskViewUtils { 
                    throw new IllegalStateException(

                            "Expected task to be showing, but it is " + mode);

                }

                if (change.getParent() == null) {

                    throw new IllegalStateException("Initiating multi-split launch but the split"

                            + "root of " + taskId + " is already visible or has broken hierarchy.");

                }

            }

            if (taskId == initialTaskId) {

                splitRoot1 = transitionInfo.getChange(change.getParent());

                splitRoot1 = change.getParent() == null ? change :

                        transitionInfo.getChange(change.getParent());

            }

            if (taskId == secondTaskId) {

                splitRoot2 = transitionInfo.getChange(change.getParent());

                splitRoot2 = change.getParent() == null ? change :

                        transitionInfo.getChange(change.getParent());

            }

        }