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

2020-02-20 02:39:25 +00:00
parent d71f157eb6 cfc30932cd
commit 21478668a7
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) {