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

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

Change-Id: I6d0467366b4b9e487cec5e20f2eefd6985e099cf
This commit is contained in:
TreeHugger Robot
2021-07-23 04:03:02 +00:00
committed by Automerger Merge Worker

View File

@@ -249,14 +249,17 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
});
return;
}
}
for (int i = 0; i < apps.length; ++i) {
if (apps[i].mode == MODE_OPENING) {
t.show(apps[i].leash);
} else {
for (int i = 0; i < apps.length; ++i) {
if (apps[i].mode == MODE_OPENING) {
t.show(apps[i].leash);
}
}
}
RemoteAnimationTarget divider = mStageCoordinator.getDividerBarLegacyTarget();
t.show(divider.leash);
if (divider.leash != null) {
t.show(divider.leash);
}
t.apply();
if (cancelled) return;
try {