summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfirst last <ewtqyqyewtqyqy@gmail.com>2024-04-11 14:23:11 +0000
committerfirst last <ewtqyqyewtqyqy@gmail.com>2024-04-11 14:28:08 +0000
commiteb7fea6f33cbefaef78f479cab408650adcac0e1 (patch)
treef0934fc66e4799e8e5a7a1266330151c4a638b97
parent5e04e9a1c47e6bfb82386ea1de4bb100f0787151 (diff)
downloadbase-eb7fea6f33cbefaef78f479cab408650adcac0e1.tar.gz
Fix NPE in SystemUI
Fixed a system UI crash when clicking a notification to launch a PendingIntent with a user-created IIntentSender. Change-Id: I4f55a12e8cc85f2d8b79e7076bc3f543280b5678
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterLogger.kt4
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"
})