From 0de26b05be53b1249f2041680706b02c954504db Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Fri, 1 Mar 2019 15:12:50 -0500 Subject: [PATCH] Don't NPE in PanelView AUPT seems to have found that this can happen sometimes; PanelView#notifyBarPanelExpansionChanged() gets called before mBar is set. So just don't call methods on it in that case Fixes: 124002167 Test: atest SystemUITests Change-Id: I137b416c3cfabd8f041c4867b4a4f25a483f00d4 --- .../com/android/systemui/statusbar/phone/PanelView.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java index 4d0c8c3a7fb60..2495d2253abb8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java @@ -1172,9 +1172,11 @@ public abstract class PanelView extends FrameLayout { } protected void notifyBarPanelExpansionChanged() { - mBar.panelExpansionChanged(mExpandedFraction, mExpandedFraction > 0f - || mPeekAnimator != null || mInstantExpanding || isPanelVisibleBecauseOfHeadsUp() - || mTracking || mHeightAnimator != null); + if (mBar != null) { + mBar.panelExpansionChanged(mExpandedFraction, mExpandedFraction > 0f + || mPeekAnimator != null || mInstantExpanding + || isPanelVisibleBecauseOfHeadsUp() || mTracking || mHeightAnimator != null); + } if (mExpansionListener != null) { mExpansionListener.accept(mExpandedFraction, mTracking); }