Merge "Fix NPE printing notification actions." into nyc-dev

This commit is contained in:
Julia Reynolds
2016-06-20 18:43:04 +00:00
committed by Android (Google) Code Review

View File

@@ -404,14 +404,16 @@ public class NotificationStation extends SettingsPreferenceFragment {
.append(bold(getString(
R.string.notification_log_details_title)))
.append(delim)
.append(action.title)
.append("\n ")
.append(bold(getString(
R.string.notification_log_details_content_intent)))
.append(delim)
.append(formatPendingIntent(action.actionIntent));
.append(action.title);
if (action.actionIntent != null) {
sb.append("\n ")
.append(bold(getString(
R.string.notification_log_details_content_intent)))
.append(delim)
.append(formatPendingIntent(action.actionIntent));
}
if (action.getRemoteInputs() != null) {
sb.append(' ')
sb.append("\n ")
.append(bold(getString(
R.string.notification_log_details_remoteinput)))
.append(delim)