diff options
| author | Julia Reynolds <juliacr@google.com> | 2020-08-26 17:07:53 -0400 |
|---|---|---|
| committer | Anis Assi <anisassi@google.com> | 2020-09-10 13:50:03 -0700 |
| commit | bea217b75d20127de2cae329ff00fe43c9aa467f (patch) | |
| tree | c268f0d58fdd804e9151a428575da14a730b6139 | |
| parent | d00a6c17034b2a18cba4852998b5e672751e39ea (diff) | |
| download | base-android-security-8.1.0_r82.tar.gz | |
DO NOT MERGE Sanitize more of the notification text fieldsandroid-security-8.1.0_r82
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: c953fdf6bc498ca791aed49df04e5a07c935b63a
Change-Id: I0e2ea12fc3351b1a56645b556720ea2306f5422a
(cherry picked from commit c953fdf6bc498ca791aed49df04e5a07c935b63a)
(cherry picked from commit f6f287a1efc76ef90e8caea952fffee862359015)
| -rw-r--r-- | core/java/android/app/Notification.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 7caeca3da6f8..eda12623cf65 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -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. @@ -6278,7 +6278,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; } @@ -6367,7 +6367,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); |