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) {