Merge "Null-check AV before checking its alpha." into rvc-dev

2020-06-26 19:39:10 +00:00
parent 5866d9207f d0f3e941c9
commit 1b824ba3df
1 changed files with 2 additions and 5 deletions
--- 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();
        }