filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE on MultiConversationNotificationState am: 9635b646d8 am: 2cbca58166 am: fc61c91c8a

Browse Source 
Change-Id: Ib018f30bd8592fa61eada8ce5c81ce59b8d60de6
This commit is contained in:
Taesu Lee
2020-05-08 18:25:33 +00:00
committed by Automerger Merge Worker
parent 3466711399 fc61c91c8a
commit 2393df67e4
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/messaging/datamodel/MessageNotificationState.java
View File

@@ -100,7 +100,6 @@ public abstract class MessageNotificationState extends NotificationState {
protected CharSequence mContent = null; protected CharSequence mContent = null;
protected Uri mAttachmentUri = null; protected Uri mAttachmentUri = null;
protected String mAttachmentType = null; protected String mAttachmentType = null;
protected boolean mTickerNoContent;
@Override @Override
protected Uri getAttachmentUri() { protected Uri getAttachmentUri() {
@@ -1088,8 +1087,10 @@ public abstract class MessageNotificationState extends NotificationState {
} }
if (state != null && LogUtil.isLoggable(TAG, LogUtil.VERBOSE)) { if (state != null && LogUtil.isLoggable(TAG, LogUtil.VERBOSE)) {
LogUtil.v(TAG, "MessageNotificationState: Notification state created" LogUtil.v(TAG, "MessageNotificationState: Notification state created"
+ ", title = " + LogUtil.sanitizePII(state.mTitle) + ", title = "
+ ", content = " + LogUtil.sanitizePII(state.mContent.toString())); + (state.mTickerSender != null ? state.mTickerSender : state.mTitle)
+ ", content = "
+ (state.mTickerText != null ? state.mTickerText : state.mContent));
} }
return state; return state;
} }
@@ -1129,8 +1130,9 @@ public abstract class MessageNotificationState extends NotificationState {
protected CharSequence getTicker() { protected CharSequence getTicker() {
return BugleNotifications.buildColonSeparatedMessage( return BugleNotifications.buildColonSeparatedMessage(
mTickerSender != null ? mTickerSender : mTitle, mTickerSender != null ? mTickerSender : mTitle,
mTickerText != null ? mTickerText : (mTickerNoContent ? null : mContent), null, mTickerText != null ? mTickerText : mContent,
null); null,
null);
} }
private static CharSequence convertHtmlAndStripUrls(final String s) { private static CharSequence convertHtmlAndStripUrls(final String s) {