Merge \"Fix NPE printing notification actions.\" into nyc-dev (018444ab) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/notification/NotificationStation.java

+9 −7

Original line number	Diff line number	Diff line
		@@ -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(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)