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

Fix NPE on MultiConversationNotificationState

Browse Source 
Use the most recent notification's state to print out log because
mContent is null in case of a notification for multiple messages in at
least 2 different conversations.
And no need sanitizePII() since this log is only for VERBOSE already.

Test: 1) adb shell setprop log.tag.MessagingAppNotif VERBOSE
      2) Receive SMS from different senders

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: Ie300620f0014577ca65b9a7e3a4c397a39717992
This commit is contained in:
Taesu Lee
2020-05-08 17:42:27 +09:00
parent 95ceb12cdb
commit 9635b646d8
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) {