Merge "Add logging for bubble flyout action." into qt-dev

am: e9c5022c03

Change-Id: I1e4d8be3d40f712011c2fd2d1cfafd189b580592

cmds/statsd/src/atoms.proto

@@ -5584,6 +5584,7 @@ message BubbleUIChanged {
         SWIPE_LEFT = 13;
         SWIPE_RIGHT = 14;
         STACK_EXPANDED = 15;
+        FLYOUT = 16;
     }
     optional Action action = 6;
 

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

@@ -926,6 +926,7 @@ public class BubbleStackView extends FrameLayout {
                 mFlyout.removeCallbacks(mHideFlyout);
                 mFlyout.postDelayed(mHideFlyout, FLYOUT_HIDE_AFTER);
             });
+            logBubbleEvent(bubble, StatsLog.BUBBLE_UICHANGED__ACTION__FLYOUT);
         }
     }
 
@@ -1097,7 +1098,8 @@ public class BubbleStackView extends FrameLayout {
      * @param action the user interaction enum.
      */
     private void logBubbleEvent(@Nullable Bubble bubble, int action) {
-        if (bubble == null) {
+        if (bubble == null || bubble.entry == null
+                || bubble.entry.notification == null) {
             StatsLog.write(StatsLog.BUBBLE_UI_CHANGED,
                     null /* package name */,
                     null /* notification channel */,