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

Commit 8ed4e994 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent NPE when dropping app icon to split" into sc-v2-dev am: c739eabb 

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

Change-Id: I6d0467366b4b9e487cec5e20f2eefd6985e099cf
parents 24024d9f c739eabb

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java

+8 −5
Original line number Diff line number Diff line
@@ -249,14 +249,17 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
                        });

                        return;

                    }

                }

                } else {

                    for (int i = 0; i < apps.length; ++i) {

                        if (apps[i].mode == MODE_OPENING) {

                            t.show(apps[i].leash);

                        }

                    }

                }

                RemoteAnimationTarget divider = mStageCoordinator.getDividerBarLegacyTarget();

                if (divider.leash != null) {

                    t.show(divider.leash);

                }

                t.apply();

                if (cancelled) return;

                try {