Merge "Fix blank activity after promoting overflow bubble" into rvc-dev am: dad1e77878 am: 0dd0ff7566

Change-Id: I90b1064624909ced4f2438ce5c9d6b587162b7ec
2020-03-14 01:02:41 +00:00
parent 9a482119f4 0dd0ff7566
commit 131e7dd3dd
1 changed files with 5 additions and 4 deletions
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleData.java
@@ -207,12 +207,13 @@ public class BubbleData {

        // Preserve new order for next repack, which sorts by last updated time.
        bubble.markUpdatedAt(mTimeSource.currentTimeMillis());
-        setSelectedBubbleInternal(bubble);
        mOverflowBubbles.remove(bubble);
-
        bubble.inflate(
-                b -> notificationEntryUpdated(bubble, /* suppressFlyout */
-                        false, /* showInShade */ true),
+                b -> {
+                    notificationEntryUpdated(bubble, /* suppressFlyout */
+                            false, /* showInShade */ true);
+                    setSelectedBubbleInternal(bubble);
+                },
                mContext, stack, factory);
        dispatchPendingChanges();
    }