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

Commit 9e8e6824 authored by Mady Mellor's avatar Mady Mellor
Browse files

Make sure we log the last bubble removal 

ag/22792413 changed the logic here & returns early so it'd miss
the log statement about the bubble removal. Update the code
to log when the last bubble is dismissed as well.

Additionally we're missing this in the code path for a dismissed
suppressed bubble (pretty edge case), but add the log event in
there as well...

Test: manual - remove last bubble
Bug: 282017959
Change-Id: I6e6e176823651d0bc8efe9e20bd573d02694a44f
parent 207bc54d

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

+2 −0
Original line number Diff line number Diff line
@@ -1791,6 +1791,7 @@ public class BubbleStackView extends FrameLayout 
                bubble.cleanupViews(); // cleans up the icon view

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

            });

            logBubbleEvent(bubble, FrameworkStatsLog.BUBBLE_UICHANGED__ACTION__DISMISSED);

            return;

        }

        // Remove it from the views
@@ -1816,6 +1817,7 @@ public class BubbleStackView extends FrameLayout 
        // If a bubble is suppressed, it is not attached to the container. Clean it up.

        if (bubble.isSuppressed()) {

            bubble.cleanupViews();

            logBubbleEvent(bubble, FrameworkStatsLog.BUBBLE_UICHANGED__ACTION__DISMISSED);

        } else {

            Log.d(TAG, "was asked to remove Bubble, but didn't find the view! " + bubble);

        }