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

Commit 284f4ffb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in SystemUI" into main am: 548ee385 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3039652



Change-Id: I5554c72a0afa2f81fedb1f66dbddaa4f7b65dbf1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 56db1fde 548ee385

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterLogger.kt

+2 −2
Original line number Diff line number Diff line
@@ -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"

        })