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

Commit 2c674d8a authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge changes I426d8365,Ic05b6542 into main 

* changes:
  [Notif] Fix most of the IDE warnings in HeadsUpManagerImpl.
  [Notif] HeadsUpManagerImpl: protected -> private for fields & methods.
parents 7bf3913d 67e99c14

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImplTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry 
import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder

import com.android.systemui.statusbar.notification.collection.provider.visualStabilityProvider

import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager

import com.android.systemui.statusbar.notification.headsup.HeadsUpManagerImpl.HeadsUpEntry

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow

import com.android.systemui.statusbar.notification.row.NotificationTestHelper

import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun

packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImpl.java

+94 −105

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerLogger.kt

+2 −2
Original line number Diff line number Diff line
@@ -156,12 +156,12 @@ constructor(@NotificationHeadsUpLog private val buffer: LogBuffer) { 
        )

    }



    fun logAutoRemoveCanceled(entry: NotificationEntry, reason: String?) {

    fun logAutoRemoveCanceled(entry: NotificationEntry?, reason: String?) {

        buffer.log(

            TAG,

            INFO,

            {

                str1 = entry.logKey

                str1 = entry?.logKey

                str2 = reason ?: "unknown"

            },

            { "cancel auto remove of $str1 reason: $str2" },