Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07e85aa5 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

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

am: 43b04bcc

Change-Id: I2763437122129654485c80b7652729526042321a
parents 5c3f9459 43b04bcc

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)