Fix issues with transitions from AOD and GONE.
1) Consolidate starting AOD -> GONE (wake and unlock) into KeyguardTransitionInteractor#startDismissKeyguardTransition. We were previously getting duplicate calls to start AOD -> GONE. Using the KeyguardSecurityContainerController signal for all of LS/BOUNCER/AOD -> GONE fixes that and is simpler to reason about. 2) Check currentState instead of startedState in listenForGoneToLockscreenOrHub. This can otherwise cause an incorrect transition to LOCKSCREEN during a transition to GONE that started after an interrupted transition. The logic we want here is 'if we're in GONE, and lockdown occurs, transition to LOCKSCREEN', so currentState makes more sense than startedState. Also, add a Subject for KeyguardTransitionRepository so we can assert things about it without having to search for the argument captor syntax every time. This can now be easily extended for other transition test use cases! Bug: 27808636 Flag: ACONFIG com.android.systemui.keyguard_wm_state_refactor DEVELOPMENT Test: atest FromGoneTransitionInteractorTest Test: atest SystemUITests Change-Id: I70d7f42bc41e2223f08463d433bf827ea6788469
Loading
Please register or sign in to comment