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

Commit 39f33f6c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd am: 6367b480 

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

Change-Id: Ie891af706cd6b27f7dfb78f65312bd465bf7e77c
parents 20e2db6d 6367b480

core/java/android/app/Notification.java

+3 −3
Original line number Diff line number Diff line
@@ -207,7 +207,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.
@@ -7830,7 +7830,7 @@ public class Notification implements Parcelable 
             */

            public Message(@NonNull CharSequence text, long timestamp, @Nullable Person sender,

                    boolean remoteInputHistory) {

                mText = text;

                mText = safeCharSequence(text);

                mTimestamp = timestamp;

                mSender = sender;

                mRemoteInputHistory = remoteInputHistory;
@@ -7944,7 +7944,7 @@ public class Notification implements Parcelable 
                bundle.putLong(KEY_TIMESTAMP, mTimestamp);

                if (mSender != null) {

                    // Legacy listeners need this

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

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

                    bundle.putParcelable(KEY_SENDER_PERSON, mSender);

                }

                if (mDataMimeType != null) {