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

Commit 978d31e4 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Sanitize more of the notification text fields 

Test: manual; monitor SystemUI performance when an app tries to
post a messaging style notification with messages with long text
Bug: 158304295
Bug: 147358092

Merged-In: c953fdf6
Change-Id: I0e2ea12fc3351b1a56645b556720ea2306f5422a
(cherry picked from commit c953fdf6)
parent b984203c

core/java/android/app/Notification.java

+3 −3
Original line number Diff line number Diff line
@@ -205,7 +205,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.
@@ -7573,7 +7573,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;
@@ -7687,7 +7687,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) {