Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f41a88df authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Fix potential NPE when removing bubble" into udc-dev am: 8afb4df8 am: 19f12b00 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23174051



Change-Id: I4849b73f4ab647e9552253a236241e79d51e930b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 425e5fc3 19f12b00

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -1784,10 +1784,13 @@ public class BubbleStackView extends FrameLayout 
            // We're expanded while the last bubble is being removed. Let the scrim animate away

            // We're expanded while the last bubble is being removed. Let the scrim animate away

            // and then remove our views (removing the icon view triggers the removal of the

            // and then remove our views (removing the icon view triggers the removal of the

            // bubble window so do that at the end of the animation so we see the scrim animate).

            // bubble window so do that at the end of the animation so we see the scrim animate).

            BadgedImageView iconView = bubble.getIconView();

            showScrim(false, () -> {

            showScrim(false, () -> {

                mRemovingLastBubbleWhileExpanded = false;

                mRemovingLastBubbleWhileExpanded = false;

                bubble.cleanupExpandedView();

                bubble.cleanupExpandedView();

                mBubbleContainer.removeView(bubble.getIconView());

                if (iconView != null) {

                    mBubbleContainer.removeView(iconView);

                }

                bubble.cleanupViews(); // cleans up the icon view

                bubble.cleanupViews(); // cleans up the icon view

                updateExpandedView(); // resets state for no expanded bubble

                updateExpandedView(); // resets state for no expanded bubble

            });

            });