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

Commit f6fc5788 authored by Beverly's avatar Beverly
Browse files

Use ConcurrentHashSet for bypassListeners 

Listeners can be updated/added/removed from
different threads. Use a multithread-friendly data structure
for listeners to avoid a ConccurentModificationException.

Test: atest KeyguardBypassControllerTest
Fixes: 394230633
Flag: EXEMPT bugfix
Change-Id: I9b3c03318deefb81d1a798f7bd2d10e06a5b670d
parent 291d0f41

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

+85 −65
Original line number Diff line number Diff line
@@ -41,16 +41,18 @@ import com.android.systemui.statusbar.policy.DevicePostureController.DEVICE_POST 
import com.android.systemui.statusbar.policy.DevicePostureController.DevicePostureInt

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.tuner.TunerService

import com.google.common.collect.Sets

import dagger.Lazy

import java.io.PrintWriter

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.distinctUntilChanged

import kotlinx.coroutines.flow.map

import com.android.app.tracing.coroutines.launchTraced as launch



@SysUISingleton

class KeyguardBypassController @Inject constructor(

class KeyguardBypassController

@Inject

constructor(

    @Main resources: Resources,

    packageManager: PackageManager,

    @Application private val applicationScope: CoroutineScope,
@@ -61,7 +63,7 @@ class KeyguardBypassController @Inject constructor( 
    private val shadeInteractorLazy: Lazy<ShadeInteractor>,

    devicePostureController: DevicePostureController,

    private val keyguardTransitionInteractor: KeyguardTransitionInteractor,

        dumpManager: DumpManager

    dumpManager: DumpManager,

) : Dumpable, StackScrollAlgorithm.BypassController {



    @BypassOverride private val bypassOverride: Int
@@ -69,16 +71,13 @@ class KeyguardBypassController @Inject constructor( 
    @DevicePostureInt private val configFaceAuthSupportedPosture: Int

    @DevicePostureInt private var postureState: Int = DEVICE_POSTURE_UNKNOWN

    private var pendingUnlock: PendingUnlock? = null

    private val listeners = mutableListOf<OnBypassStateChangedListener>()

    private val faceAuthEnabledChangedCallback = object : KeyguardStateController.Callback {

    private val listeners = Sets.newConcurrentHashSet<OnBypassStateChangedListener>()

    private val faceAuthEnabledChangedCallback =

        object : KeyguardStateController.Callback {

            override fun onFaceEnrolledChanged() = notifyListeners()

        }



    @IntDef(

        FACE_UNLOCK_BYPASS_NO_OVERRIDE,

        FACE_UNLOCK_BYPASS_ALWAYS,

        FACE_UNLOCK_BYPASS_NEVER

    )

    @IntDef(FACE_UNLOCK_BYPASS_NO_OVERRIDE, FACE_UNLOCK_BYPASS_ALWAYS, FACE_UNLOCK_BYPASS_NEVER)

    @Retention(AnnotationRetention.SOURCE)

    private annotation class BypassOverride
@@ -87,12 +86,12 @@ class KeyguardBypassController @Inject constructor( 
     *

     * The pending unlock type which is set if the bypass was blocked when it happened.

     *

     * Whether the pending unlock type is strong biometric or non-strong biometric

     * (i.e. weak or convenience).

     * Whether the pending unlock type is strong biometric or non-strong biometric (i.e. weak or

     * convenience).

     */

    private data class PendingUnlock(

        val pendingUnlockType: BiometricSourceType,

        val isStrongBiometric: Boolean

        val isStrongBiometric: Boolean,

    )



    lateinit var unlockController: BiometricUnlockController
@@ -101,17 +100,17 @@ class KeyguardBypassController @Inject constructor( 
    /** delegates to [bypassEnabled] but conforms to [StackScrollAlgorithm.BypassController] */

    override fun isBypassEnabled() = bypassEnabled



    /**

     * If face unlock dismisses the lock screen or keeps user on keyguard for the current user.

     */

    /** If face unlock dismisses the lock screen or keeps user on keyguard for the current user. */

    var bypassEnabled: Boolean = false

        get() {

            val enabled = when (bypassOverride) {

            val enabled =

                when (bypassOverride) {

                    FACE_UNLOCK_BYPASS_ALWAYS -> true

                    FACE_UNLOCK_BYPASS_NEVER -> false

                    else -> field

                }

            return enabled && keyguardStateController.isFaceEnrolledAndEnabled &&

            return enabled &&

                keyguardStateController.isFaceEnrolledAndEnabled &&

                isPostureAllowedForFaceAuth()

        }

        private set(value) {
@@ -138,30 +137,44 @@ class KeyguardBypassController @Inject constructor( 
                }

            }

            dumpManager.registerNormalDumpable("KeyguardBypassController", this)

            statusBarStateController.addCallback(object : StatusBarStateController.StateListener {

            statusBarStateController.addCallback(

                object : StatusBarStateController.StateListener {

                    override fun onStateChanged(newState: Int) {

                        if (newState != StatusBarState.KEYGUARD) {

                            pendingUnlock = null

                        }

                    }

            })

            val dismissByDefault = if (resources.getBoolean(

                            com.android.internal.R.bool.config_faceAuthDismissesKeyguard)) 1 else 0

            tunerService.addTunable({ key, _ ->

                bypassEnabled = tunerService.getValue(key, dismissByDefault) != 0

            }, Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD)

                }

            )

            val dismissByDefault =

                if (

                    resources.getBoolean(

                        com.android.internal.R.bool.config_faceAuthDismissesKeyguard

                    )

                )

                    1

                else 0

            tunerService.addTunable(

                { key, _ -> bypassEnabled = tunerService.getValue(key, dismissByDefault) != 0 },

                Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD,

            )

            lockscreenUserManager.addUserChangedListener(

                object : NotificationLockscreenUserManager.UserChangedListener {

                    override fun onUserChanged(userId: Int) {

                        pendingUnlock = null

                    }

                    })

                }

            )

        }

    }



    fun listenForQsExpandedChange() =

        applicationScope.launch("listenForQsExpandedChange") {

            shadeInteractorLazy.get().qsExpansion.map { it > 0f }.distinctUntilChanged()

            shadeInteractorLazy

                .get()

                .qsExpansion

                .map { it > 0f }

                .distinctUntilChanged()

                .collect { isQsExpanded ->

                    val changed = qsExpanded != isQsExpanded

                    qsExpanded = isQsExpanded
@@ -171,7 +184,8 @@ class KeyguardBypassController @Inject constructor( 
                }

        }



    private fun notifyListeners() = listeners.forEachTraced("KeyguardBypassController") {

    private fun notifyListeners() =

        listeners.forEachTraced("KeyguardBypassController") {

            it.onBypassStateChanged(bypassEnabled)

        }
@@ -182,7 +196,7 @@ class KeyguardBypassController @Inject constructor( 
     */

    fun onBiometricAuthenticated(

        biometricSourceType: BiometricSourceType,

        isStrongBiometric: Boolean

        isStrongBiometric: Boolean,

    ): Boolean {

        if (biometricSourceType == BiometricSourceType.FACE && bypassEnabled) {

            val can = canBypass()
@@ -196,18 +210,22 @@ class KeyguardBypassController @Inject constructor( 


    fun maybePerformPendingUnlock() {

        if (pendingUnlock != null) {

            if (onBiometricAuthenticated(pendingUnlock!!.pendingUnlockType,

                            pendingUnlock!!.isStrongBiometric)) {

                unlockController.startWakeAndUnlock(pendingUnlock!!.pendingUnlockType,

                        pendingUnlock!!.isStrongBiometric)

            if (

                onBiometricAuthenticated(

                    pendingUnlock!!.pendingUnlockType,

                    pendingUnlock!!.isStrongBiometric,

                )

            ) {

                unlockController.startWakeAndUnlock(

                    pendingUnlock!!.pendingUnlockType,

                    pendingUnlock!!.isStrongBiometric,

                )

                pendingUnlock = null

            }

        }

    }



    /**

     * If keyguard can be dismissed because of bypass.

     */

    /** If keyguard can be dismissed because of bypass. */

    fun canBypass(): Boolean {

        if (bypassEnabled) {

            return when {
@@ -245,8 +263,10 @@ class KeyguardBypassController @Inject constructor( 
        pw.println("  bypassEnabled: $bypassEnabled")

        pw.println("  canBypass: ${canBypass()}")

        pw.println("  bouncerShowing: $bouncerShowing")

        pw.println("  altBouncerShowing:" +

            " ${keyguardTransitionInteractor.getCurrentState() == KeyguardState.ALTERNATE_BOUNCER}")

        pw.println(

            "  altBouncerShowing:" +

                " ${keyguardTransitionInteractor.getCurrentState() == KeyguardState.ALTERNATE_BOUNCER}"

        )

        pw.println("  isPulseExpanding: $isPulseExpanding")

        pw.println("  launchingAffordance: $launchingAffordance")

        pw.println("  qSExpanded: $qsExpanded")