Merge "Prevent Conversations from using custom views." into main

2 files changed, 18 insertions, 1 deletions

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 4d73c354707d..392a1f113c23 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -8839,6 +8839,16 @@ public class Notification implements Parcelable
         }
 
         /**
+         * @hide
+         */
+        public boolean displayCustomViewInline() {
+            // This is a lie; True is returned for conversations to make sure that the custom
+            // view is not used instead of the template, but it will not actually be included.
+            return Flags.notificationNoCustomViewConversations()
+                    && mConversationType != CONVERSATION_TYPE_LEGACY;
+        }
+
+        /**
          * @return the text that should be displayed in the statusBar when heads upped.
          * If {@code null} is returned, the default implementation will be used.
          *
diff --git a/core/java/android/app/notification.aconfig b/core/java/android/app/notification.aconfig
index 9b06adf4e894..108b5f40863c 100644
--- a/core/java/android/app/notification.aconfig
+++ b/core/java/android/app/notification.aconfig
@@ -105,6 +105,13 @@ flag {
 }
 
 flag {
+  name: "notification_no_custom_view_conversations"
+  namespace: "systemui"
+  description: "Ensures that conversations are not allowed to use Custom Views."
+  bug: "368817201"
+}
+
+flag {
   name: "keyguard_private_notifications"
   namespace: "systemui"
   description: "Fixes the behavior of KeyguardManager#setPrivateNotificationsAllowed()"
@@ -244,4 +251,4 @@ flag {
   namespace: "systemui"
   description: "Guards new android.app.richongoingnotification promotion and new uis"
   bug: "337261753"
-}
\ No newline at end of file
+}