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

Commit 0e8d5cbf authored by Matt Pietal's avatar Matt Pietal
Browse files

Rely on isKeyguardDismissible for insecure camera launch 

This also matches the logic in CameraGestureHelper which
relies solely on the keyguard being dismissible. This should
help with inconsistencies in KeyguardState.

Test: atest FromAodTransitionInteractorTest
Fixes: 339851684
Flag: EXEMPT
Change-Id: Iafd6aa2c32e3ff2833a5d66c00b31a150a63fc44
parent 8d3a8fb2

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractorTest.kt

+5 −3
Original line number Diff line number Diff line
@@ -136,20 +136,20 @@ class FromAodTransitionInteractorTest : SysuiTestCase() { 


    @Test

    @EnableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR)

    fun testTransitionToOccluded_onWakeUp_ifPowerButtonGestureDetected_fromAod_nonDismissableKeyguard() =

    fun testTransitionToOccluded_onWakeUp_ifPowerButtonGestureDetected_fromAod_nonDismissibleKeyguard() =

        testScope.runTest {

            powerInteractor.onCameraLaunchGestureDetected()

            powerInteractor.setAwakeForTest()

            advanceTimeBy(100) // account for debouncing



            // We should head back to GONE since we started there.

            // We should head to OCCLUDED because keyguard is not dismissible.

            assertThat(transitionRepository)

                .startedTransition(from = KeyguardState.AOD, to = KeyguardState.OCCLUDED)

        }



    @Test

    @EnableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR)

    fun testTransitionToGone_onWakeUp_ifPowerButtonGestureDetected_fromAod_dismissableKeyguard() =

    fun testTransitionToGone_onWakeUp_ifPowerButtonGestureDetected_fromAod_dismissibleKeyguard() =

        testScope.runTest {

            kosmos.fakeKeyguardRepository.setKeyguardDismissible(true)

            powerInteractor.onCameraLaunchGestureDetected()
@@ -188,6 +188,7 @@ class FromAodTransitionInteractorTest : SysuiTestCase() { 
            )



            // Detect a power gesture and then wake up.

            kosmos.fakeKeyguardRepository.setKeyguardDismissible(true)

            reset(transitionRepository)

            powerInteractor.onCameraLaunchGestureDetected()

            powerInteractor.setAwakeForTest()
@@ -355,6 +356,7 @@ class FromAodTransitionInteractorTest : SysuiTestCase() { 
            )



            // Detect a power gesture and then wake up.

            kosmos.fakeKeyguardRepository.setKeyguardDismissible(true)

            reset(transitionRepository)

            powerInteractor.onCameraLaunchGestureDetected()

            powerInteractor.setAwakeForTest()

packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractorTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractorTest.kt

+2 −1
Original line number Diff line number Diff line
@@ -56,13 +56,13 @@ import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.se 
import com.android.systemui.power.domain.interactor.powerInteractor

import com.android.systemui.testKosmos

import junit.framework.Assert.assertEquals

import kotlin.test.Test

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.flowOf

import kotlinx.coroutines.runBlocking

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mockito.reset

import org.mockito.Mockito.spy
@@ -230,6 +230,7 @@ class FromDozingTransitionInteractorTest : SysuiTestCase() { 
            )



            // Detect a power gesture and then wake up.

            kosmos.fakeKeyguardRepository.setKeyguardDismissible(true)

            reset(transitionRepository)

            powerInteractor.onCameraLaunchGestureDetected()

            powerInteractor.setAwakeForTest()

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAlternateBouncerTransitionInteractor.kt

+2 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ constructor( 
    @Background private val scope: CoroutineScope,

    @Background bgDispatcher: CoroutineDispatcher,

    @Main mainDispatcher: CoroutineDispatcher,

    private val keyguardInteractor: KeyguardInteractor,

    keyguardInteractor: KeyguardInteractor,

    private val communalInteractor: CommunalInteractor,

    powerInteractor: PowerInteractor,

    keyguardOcclusionInteractor: KeyguardOcclusionInteractor,
@@ -70,6 +70,7 @@ constructor( 
        bgDispatcher = bgDispatcher,

        powerInteractor = powerInteractor,

        keyguardOcclusionInteractor = keyguardOcclusionInteractor,

        keyguardInteractor = keyguardInteractor,

    ) {



    override fun start() {

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromAodTransitionInteractor.kt

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ constructor( 
    @Background private val scope: CoroutineScope,

    @Background bgDispatcher: CoroutineDispatcher,

    @Main mainDispatcher: CoroutineDispatcher,

    private val keyguardInteractor: KeyguardInteractor,

    keyguardInteractor: KeyguardInteractor,

    powerInteractor: PowerInteractor,

    keyguardOcclusionInteractor: KeyguardOcclusionInteractor,

    val deviceEntryRepository: DeviceEntryRepository,
@@ -60,6 +60,7 @@ constructor( 
        bgDispatcher = bgDispatcher,

        powerInteractor = powerInteractor,

        keyguardOcclusionInteractor = keyguardOcclusionInteractor,

        keyguardInteractor = keyguardInteractor,

    ) {



    override fun start() {

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromDozingTransitionInteractor.kt

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ constructor( 
    @Background private val scope: CoroutineScope,

    @Background bgDispatcher: CoroutineDispatcher,

    @Main mainDispatcher: CoroutineDispatcher,

    private val keyguardInteractor: KeyguardInteractor,

    keyguardInteractor: KeyguardInteractor,

    powerInteractor: PowerInteractor,

    private val communalInteractor: CommunalInteractor,

    keyguardOcclusionInteractor: KeyguardOcclusionInteractor,
@@ -60,6 +60,7 @@ constructor( 
        bgDispatcher = bgDispatcher,

        powerInteractor = powerInteractor,

        keyguardOcclusionInteractor = keyguardOcclusionInteractor,

        keyguardInteractor = keyguardInteractor,

    ) {



    override fun start() {