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 am: db023fcd73

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

Change-Id: I4c847573b6ce8032084eeeee4835bd38be9c6c79
This commit is contained in:
Julia Reynolds
2020-09-09 22:32:12 +00:00
committed by Automerger Merge Worker
parent ea36a0c236 db023fcd73
commit 2d7d8c2604
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

@@ -184,7 +184,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.
@@ -6259,7 +6259,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;
} }
@@ -6348,7 +6348,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);