From d0f3e941c9589c2f0e960b0825026f0cbf11ade7 Mon Sep 17 00:00:00 2001
From: Josh Tsuji <tsuji@google.com>
Date: Fri, 26 Jun 2020 13:39:30 -0400
Subject: Null-check AV before checking its alpha.

Bug: 159769573
Test: no crashing
Change-Id: I139091a1b4689e13b2b3337ee2988df662798204
---
 .../src/com/android/systemui/bubbles/BubbleExpandedView.java       | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
index 2bfe015c2787..1211fb491ced 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
@@ -495,12 +495,9 @@ public class BubbleExpandedView extends LinearLayout {
         }
         final float alpha = visibility ? 1f : 0f;
 
-        if (alpha == mActivityView.getAlpha()) {
-            return;
-        }
-
         mPointerView.setAlpha(alpha);
-        if (mActivityView != null) {
+
+        if (mActivityView != null && alpha != mActivityView.getAlpha()) {
             mActivityView.setAlpha(alpha);
             mActivityView.bringToFront();
         }
-- 
cgit v1.2.3-59-g8ed1b