Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Sanitize more of the notification text fields

Browse Source 
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: c953fdf6bc
Change-Id: I0e2ea12fc3351b1a56645b556720ea2306f5422a
(cherry picked from commit c953fdf6bc)
This commit is contained in:
Julia Reynolds
2020-08-26 17:07:53 -04:00
parent a710a30457
commit db023fcd73
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/Notification.java
View File

@@ -183,7 +183,7 @@ public class Notification implements Parcelable
* <p> * <p>
* Avoids spamming the system with overly large strings such as full e-mails. * 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. * Maximum entries of reply text that are accepted by Builder and friends.
@@ -6086,7 +6086,7 @@ public class Notification implements Parcelable
* consistent during re-posts of the notification. * consistent during re-posts of the notification.
*/ */
public Message(CharSequence text, long timestamp, CharSequence sender){ public Message(CharSequence text, long timestamp, CharSequence sender){
mText = text; mText = safeCharSequence(text);
mTimestamp = timestamp; mTimestamp = timestamp;
mSender = sender; mSender = sender;
} }
@@ -6175,7 +6175,7 @@ public class Notification implements Parcelable
} }
bundle.putLong(KEY_TIMESTAMP, mTimestamp); bundle.putLong(KEY_TIMESTAMP, mTimestamp);
if (mSender != null) { if (mSender != null) {
bundle.putCharSequence(KEY_SENDER, mSender); bundle.putCharSequence(KEY_SENDER, safeCharSequence(mSender));
} }
if (mDataMimeType != null) { if (mDataMimeType != null) {
bundle.putString(KEY_DATA_MIME_TYPE, mDataMimeType); bundle.putString(KEY_DATA_MIME_TYPE, mDataMimeType);