PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 43b04bcc7d

Change-Id: I2763437122129654485c80b7652729526042321a
This commit is contained in:
Julia Reynolds
2016-06-20 18:58:07 +00:00
committed by android-build-merger
parent 5c3f9459e8 43b04bcc7d
commit 07e85aa5c0
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/notification/NotificationStation.java
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)