From 603bda15e85cebbbc8cd3210ed8f708b9e100f6e Mon Sep 17 00:00:00 2001
From: Jerry Chang <chenghsiuchang@google.com>
Date: Wed, 21 Jul 2021 15:48:26 +0800
Subject: [PATCH] Prevent NPE when dropping app icon to split

Fix: 194154810
Test: drop to split won't trow NPE.
Change-Id: Ie3a6e9a606206cc1c5c26da131551616e29d03da
---
 .../wm/shell/splitscreen/SplitScreenController.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java
index aca545b4b211c..71f23a7b2a737 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java
@@ -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 {