diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-24 19:16:54 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-24 19:16:54 +0000 |
commit | 548ee3851e394f9eeac1f105904cba9f2a6f2d10 (patch) | |
tree | 66643625c17ca2b7040ff36fa12c31b239f0d6c6 | |
parent | 25d36a491643c849e5ccfef3064544ca7769f586 (diff) | |
parent | eb7fea6f33cbefaef78f479cab408650adcac0e1 (diff) | |
download | base-548ee3851e394f9eeac1f105904cba9f2a6f2d10.tar.gz |
Merge "Fix NPE in SystemUI" into main
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterLogger.kt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterLogger.kt index 4211cabcbc56..66e909c64c6c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterLogger.kt @@ -70,7 +70,7 @@ class StatusBarNotificationActivityStarterLogger @Inject constructor( fun logSendPendingIntent(entry: NotificationEntry, pendingIntent: PendingIntent, result: Int) { buffer.log(TAG, INFO, { str1 = entry.logKey - str2 = pendingIntent.intent.toString() + str2 = pendingIntent.intent?.toString() int1 = result }, { "(5/5) Started intent $str2 for notification $str1 with result code $int1" @@ -120,7 +120,7 @@ class StatusBarNotificationActivityStarterLogger @Inject constructor( fun logSendingFullScreenIntent(entry: NotificationEntry, pendingIntent: PendingIntent) { buffer.log(TAG, INFO, { str1 = entry.logKey - str2 = pendingIntent.intent.toString() + str2 = pendingIntent.intent?.toString() }, { "Notification $str1 has fullScreenIntent; sending fullScreenIntent $str2" }) |