From cfc30932cd3377ba8f0db02acaf4da359d3c3222 Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Wed, 19 Feb 2020 17:09:48 -0800
Subject: [PATCH] Fix crash when divider receives imetarget that isn't in a
 split

Bug: 149828540
Test: Can use ime on keyguard
Change-Id: Iae7007d6c8157cffd821e2372d19b27df869d6c7
---
 .../src/com/android/systemui/stackdivider/Divider.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
index 2daefbde45a87..56cdff43e2552 100644
--- a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
+++ b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
@@ -137,7 +137,8 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
                         try {
                             mLastImeTarget = ActivityTaskManager.getTaskOrganizerController()
                                     .getImeTarget(displayId);
-                            mShouldAdjustForIme = !mSplitLayout.mDisplayLayout.isLandscape()
+                            mShouldAdjustForIme = mLastImeTarget != null
+                                    && !mSplitLayout.mDisplayLayout.isLandscape()
                                     && (mLastImeTarget.asBinder()
                                     == mSplits.mSecondary.token.asBinder());
                         } catch (RemoteException e) {