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

Commit 92c3e83d authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

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

parents b5378013 9a796f3b

core/java/android/app/Notification.java

+10 −0
Original line number Diff line number Diff line
@@ -8838,6 +8838,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.

































core/java/android/app/notification.aconfig



+8
−1




























Original line number
Diff line number
Diff line








@@ -104,6 +104,13 @@ flag {













  bug: "339523906"















}





























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"