Merge "Sanitize more of the notification text fields" (4f26f3f1) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -207,7 +207,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.
		@@ -7863,7 +7863,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;
		@@ -7977,7 +7977,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) {