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: I427adea08ff2a9f50c0d54329ae1b5adcca508c8
This commit is contained in:
Julia Reynolds
2016-06-20 19:08:43 +00:00
committed by android-build-merger
parent b363eb89bc 43b04bcc7d
commit 018444ab61
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/notification/NotificationStation.java
View File

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