commit cfc30932cd3377ba8f0db02acaf4da359d3c3222
author Evan Rosky <erosky@google.com> Wed Feb 19 17:09:48 2020 -0800
committer Evan Rosky <erosky@google.com> Wed Feb 19 17:09:48 2020 -0800
tree 5a1316d2f548e9f536526790d6233cc4b303bf32
parent 58b9a11b072de9bac8a0a2c7b9673c6c587ba047

Fix crash when divider receives imetarget that isn't in a split

Bug: 149828540
Test: Can use ime on keyguard
Change-Id: Iae7007d6c8157cffd821e2372d19b27df869d6c7

packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java

diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
index 2daefbd..56cdff4 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 @@
                         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) {