summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson Chung <winsonc@google.com> 2020-07-07 04:03:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-07 04:03:00 +0000
commitf4a792497f11d3d310bb7eaaddd9dddf55b0af4e (patch)
treed11bd0d730b2365333cd4933320aa3d7eeb63d48
parent6b197afb781e704a5338f5624aaac3e110825ec3 (diff)
parent732f43e51e9da6ddc07fb6c3f7db06e701afbfa0 (diff)
Merge "Adding null check for split bounds before notifying" into rvc-dev am: 736647f28c am: 732f43e51e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12090432 Change-Id: I8a5d2ffa53ade9c8e5153385844bef89a1373d60
-rw-r--r--packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java3
1 files changed, 3 insertions, 0 deletions
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());