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

Commit 26d5493e authored by Jerry Chang's avatar Jerry Chang Committed by Android (Google) Code Review
Browse files

Merge "Prevent exception when quick switching between two split pairs" into udc-dev

parents 1f3c56af 97eb471f
Loading
Loading
Loading
Loading
+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());
            }
        }