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

Commit fe309173 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Initialize isKeyguardEnabled from LockPatternUtils." into main

parents 5812079c f904294d

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardRepositoryImplTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.graphics.Point 
import android.hardware.biometrics.BiometricSourceType

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.internal.widget.LockPatternUtils

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.keyguard.KeyguardUpdateMonitorCallback

import com.android.systemui.SysuiTestCase
@@ -73,6 +74,7 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { 
    @Mock private lateinit var keyguardUpdateMonitor: KeyguardUpdateMonitor

    @Mock private lateinit var dreamOverlayCallbackController: DreamOverlayCallbackController

    @Mock private lateinit var userTracker: UserTracker

    @Mock private lateinit var lockPatternUtils: LockPatternUtils

    @Captor private lateinit var updateCallbackCaptor: ArgumentCaptor<KeyguardUpdateMonitorCallback>

    private val mainDispatcher = StandardTestDispatcher()

    private val testDispatcher = StandardTestDispatcher()
@@ -100,6 +102,7 @@ class KeyguardRepositoryImplTest : SysuiTestCase() { 
                systemClock,

                facePropertyRepository,

                userTracker,

                lockPatternUtils,

            )

    }

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt

+4 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.keyguard.data.repository



import android.graphics.Point

import com.android.internal.widget.LockPatternUtils

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.keyguard.KeyguardUpdateMonitorCallback

import com.android.systemui.biometrics.AuthController
@@ -321,6 +322,7 @@ constructor( 
    private val systemClock: SystemClock,

    facePropertyRepository: FacePropertyRepository,

    private val userTracker: UserTracker,

    lockPatternUtils: LockPatternUtils,

) : KeyguardRepository {

    private val _dismissAction: MutableStateFlow<DismissAction> =

        MutableStateFlow(DismissAction.None)
@@ -478,7 +480,8 @@ constructor( 
        awaitClose { keyguardStateController.removeCallback(callback) }

    }



    private val _isKeyguardEnabled = MutableStateFlow(true)

    private val _isKeyguardEnabled =

        MutableStateFlow(!lockPatternUtils.isLockScreenDisabled(userTracker.userId))

    override val isKeyguardEnabled: StateFlow<Boolean> = _isKeyguardEnabled.asStateFlow()



    private val _isDozing = MutableStateFlow(statusBarStateController.isDozing)