commit d107f6266155a22d189c29d6bd22ee0c1ee608cf
author Sergey Serokurov <serokurov@google.com> Thu Jun 23 20:39:36 2022 -0700
committer Sergey Serokurov <serokurov@google.com> Thu Jun 23 20:47:13 2022 -0700
tree a3255ef4d3169165d5f727799a3683139d6f79e4
parent ab56bf206c0d4d5948f3ca1cb6f4c71bf7b62de6

Check if apps allowed to show bubbles

Bug: 228132134
Test: atest SystemUITests
Change-Id: I0f29dcb9965345ef0df82779b1e12eca13f220c4

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
index 134f24e..27aa4b3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
@@ -266,9 +266,14 @@
         snooze.setOnClickListener(mOnSnoozeClick);
         */
 
-        if (mAppBubble == BUBBLE_PREFERENCE_ALL) {
-            ((TextView) findViewById(R.id.default_summary)).setText(getResources().getString(
+        TextView defaultSummaryTextView = findViewById(R.id.default_summary);
+        if (mAppBubble == BUBBLE_PREFERENCE_ALL
+                && BubblesManager.areBubblesEnabled(mContext, mSbn.getUser())) {
+            defaultSummaryTextView.setText(getResources().getString(
                     R.string.notification_channel_summary_default_with_bubbles, mAppName));
+        } else {
+            defaultSummaryTextView.setText(getResources().getString(
+                    R.string.notification_channel_summary_default));
         }
 
         findViewById(R.id.priority).setOnClickListener(mOnFavoriteClick);