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

Bug: 149828540 Test: Can use ime on keyguard Change-Id: Iae7007d6c8157cffd821e2372d19b27df869d6c7
2020-02-19 17:09:48 -08:00
parent 58b9a11b07
commit cfc30932cd
1 changed files with 2 additions and 1 deletions
--- 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) {