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

Commit 2d7d8c26 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

DO NOT MERGE Sanitize more of the notification text fields am: db023fcd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512962

Change-Id: I4c847573b6ce8032084eeeee4835bd38be9c6c79
parents ea36a0c2 db023fcd

core/java/android/app/Notification.java

+3 −3
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ public class Notification implements Parcelable 
     * <p>

     * Avoids spamming the system with overly large strings such as full e-mails.

     */

    private static final int MAX_CHARSEQUENCE_LENGTH = 5 * 1024;

    private static final int MAX_CHARSEQUENCE_LENGTH = 1024;



    /**

     * Maximum entries of reply text that are accepted by Builder and friends.
@@ -6259,7 +6259,7 @@ public class Notification implements Parcelable 
             * consistent during re-posts of the notification.

             */

            public Message(CharSequence text, long timestamp, CharSequence sender){

                mText = text;

                mText = safeCharSequence(text);

                mTimestamp = timestamp;

                mSender = sender;

            }
@@ -6348,7 +6348,7 @@ public class Notification implements Parcelable 
                }

                bundle.putLong(KEY_TIMESTAMP, mTimestamp);

                if (mSender != null) {

                    bundle.putCharSequence(KEY_SENDER, mSender);

                    bundle.putCharSequence(KEY_SENDER, safeCharSequence(mSender));

                }

                if (mDataMimeType != null) {

                    bundle.putString(KEY_DATA_MIME_TYPE, mDataMimeType);