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

Commit 2f5c581d authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge "Fix issue where we'd start GONE -> LS instead of AOD -> LS." into main

parents d597f206 bfcb6bb3

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

+3 −3
Original line number Diff line number Diff line
@@ -68,11 +68,11 @@ constructor( 
        scope.launch {

            keyguardInteractor.isKeyguardShowing

                .sample(

                    currentKeyguardState,

                    startedKeyguardState,

                    communalInteractor.isIdleOnCommunal,

                )

                .collect { (isKeyguardShowing, currentState, isIdleOnCommunal) ->

                    if (isKeyguardShowing && currentState == KeyguardState.GONE) {

                .collect { (isKeyguardShowing, startedState, isIdleOnCommunal) ->

                    if (isKeyguardShowing && startedState == KeyguardState.GONE) {

                        val to =

                            if (isIdleOnCommunal) {

                                KeyguardState.GLANCEABLE_HUB

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

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.systemui.testKosmos 
import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Ignore

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mockito.reset
@@ -53,6 +54,7 @@ class FromGoneTransitionInteractorTest : SysuiTestCase() { 
    }



    @Test

    @Ignore("Fails due to fix for b/324432820 - will re-enable once permanent fix is submitted.")

    fun testDoesNotTransitionToLockscreen_ifStartedButNotFinishedInGone() =

        testScope.runTest {

            keyguardTransitionRepository.sendTransitionSteps(