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

Merge "Sanitize more of the notification text fields" into pi-dev am: c0ec138c47

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

Change-Id: Ie8e9b9a1273f5fd48a038f16749a7ecdd85078cf
This commit is contained in:
TreeHugger Robot
2020-09-09 23:57:36 +00:00
committed by Automerger Merge Worker
parent f6d7b592ff c0ec138c47
commit 06adb3f55c
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

@@ -205,7 +205,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.
@@ -7573,7 +7573,7 @@ public class Notification implements Parcelable
*/ */
public Message(@NonNull CharSequence text, long timestamp, @Nullable Person sender, public Message(@NonNull CharSequence text, long timestamp, @Nullable Person sender,
boolean remoteInputHistory) { boolean remoteInputHistory) {
mText = text; mText = safeCharSequence(text);
mTimestamp = timestamp; mTimestamp = timestamp;
mSender = sender; mSender = sender;
mRemoteInputHistory = remoteInputHistory; mRemoteInputHistory = remoteInputHistory;
@@ -7687,7 +7687,7 @@ public class Notification implements Parcelable
bundle.putLong(KEY_TIMESTAMP, mTimestamp); bundle.putLong(KEY_TIMESTAMP, mTimestamp);
if (mSender != null) { if (mSender != null) {
// Legacy listeners need this // Legacy listeners need this
bundle.putCharSequence(KEY_SENDER, mSender.getName()); bundle.putCharSequence(KEY_SENDER, safeCharSequence(mSender.getName()));
bundle.putParcelable(KEY_SENDER_PERSON, mSender); bundle.putParcelable(KEY_SENDER_PERSON, mSender);
} }
if (mDataMimeType != null) { if (mDataMimeType != null) {