From f15dd752350db8fca730e810cfad7669d6131f81 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 6 Jul 2020 16:09:43 -0700 Subject: Adding null check for split bounds before notifying Bug: 160626905 Test: Manual, just a null check Change-Id: I94e3fd1f63edae131fa1cfe56eedad8a8d19b186 --- .../SystemUI/src/com/android/systemui/stackdivider/DividerView.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java index 6f554e698c58..b6c6afd523b3 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java @@ -675,6 +675,9 @@ public class DividerView extends FrameLayout implements OnTouchListener, } private void notifySplitScreenBoundsChanged() { + if (mSplitLayout.mPrimary == null || mSplitLayout.mSecondary == null) { + return; + } mOtherTaskRect.set(mSplitLayout.mSecondary); mTmpRect.set(mHandle.getLeft(), mHandle.getTop(), mHandle.getRight(), mHandle.getBottom()); -- cgit v1.2.3-59-g8ed1b