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

Commit 9679061f authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Allow nullable in LogBuffers in ClockEventController" into tm-qpr-dev am: b0b34d3e 

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



Change-Id: If3b0ec801bf2734deff9ef3df2d4f1ae858e4971
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dcc89ba0 b0b34d3e

packages/SystemUI/src/com/android/keyguard/ClockEventController.kt

+5 −2
Original line number Diff line number Diff line
@@ -69,14 +69,17 @@ open class ClockEventController @Inject constructor( 
    private val context: Context,

    @Main private val mainExecutor: Executor,

    @Background private val bgExecutor: Executor,

    @KeyguardClockLog private val logBuffer: LogBuffer,

    @KeyguardClockLog private val logBuffer: LogBuffer?,

    private val featureFlags: FeatureFlags

) {

    var clock: ClockController? = null

        set(value) {

            field = value

            if (value != null) {

                if (logBuffer != null) {

                    value.setLogBuffer(logBuffer)

                }



                value.initialize(resources, dozeAmount, 0f)

                updateRegionSamplers(value)

            }

packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ import org.mockito.junit.MockitoJUnit 
class ClockEventControllerTest : SysuiTestCase() {



    @JvmField @Rule val mockito = MockitoJUnit.rule()

    @Mock private lateinit var keyguardInteractor: KeyguardInteractor

    @Mock private lateinit var broadcastDispatcher: BroadcastDispatcher

    @Mock private lateinit var batteryController: BatteryController

    @Mock private lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor