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

Commit cd1ea09d authored by Matt Pietal's avatar Matt Pietal
Browse files

Add reasons from DOZING->GONE 

And some additional audit logs

Test: N/A just additional logs
Bug: 369554853
Flag: EXEMPT bugfix
Change-Id: I11b3cb18e35b5734ac6cef4ac9db5da7b96e1602
parent 3b0f74a1

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

+14 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.animation.ValueAnimator 
import android.annotation.SuppressLint

import android.app.DreamManager

import com.android.app.animation.Interpolators

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

import com.android.systemui.Flags.communalSceneKtfRefactor

import com.android.systemui.communal.domain.interactor.CommunalInteractor

import com.android.systemui.communal.domain.interactor.CommunalSceneInteractor
@@ -41,7 +42,6 @@ import kotlin.time.Duration.Companion.milliseconds 
import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.debounce

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



@SysUISingleton

class FromDozingTransitionInteractor
@@ -135,11 +135,22 @@ constructor( 


                    if (!deviceEntryInteractor.isLockscreenEnabled()) {

                        if (!SceneContainerFlag.isEnabled) {

                            startTransitionTo(KeyguardState.GONE)

                            startTransitionTo(

                                KeyguardState.GONE,

                                ownerReason = "lockscreen not enabled",

                            )

                        }

                    } else if (canDismissLockscreen() || isKeyguardGoingAway) {

                        if (!SceneContainerFlag.isEnabled) {

                            startTransitionTo(KeyguardState.GONE)

                            startTransitionTo(

                                KeyguardState.GONE,

                                ownerReason =

                                    if (canDismissLockscreen()) {

                                        "canDismissLockscreen()"

                                    } else {

                                        "isKeyguardGoingAway"

                                    },

                            )

                        }

                    } else if (primaryBouncerShowing) {

                        if (!SceneContainerFlag.isEnabled) {

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

+15 −1
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@ 


package com.android.systemui.keyguard.domain.interactor



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

import com.android.keyguard.logging.KeyguardLogger

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor

import com.android.systemui.keyguard.ui.viewmodel.AodBurnInViewModel

import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel

import com.android.systemui.log.core.LogLevel.VERBOSE
@@ -29,7 +31,6 @@ import com.android.systemui.statusbar.notification.stack.ui.viewmodel.SharedNoti 
import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.debounce

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



private val TAG = KeyguardTransitionAuditLogger::class.simpleName!!
@@ -48,6 +49,7 @@ constructor( 
    private val aodBurnInViewModel: AodBurnInViewModel,

    private val shadeInteractor: ShadeInteractor,

    private val keyguardOcclusionInteractor: KeyguardOcclusionInteractor,

    private val deviceEntryInteractor: DeviceEntryInteractor,

) {



    fun start() {
@@ -83,6 +85,18 @@ constructor( 
            }

        }



        scope.launch {

            deviceEntryInteractor.isUnlocked.collect {

                logger.log(TAG, VERBOSE, "DeviceEntry isUnlocked", it)

            }

        }



        scope.launch {

            deviceEntryInteractor.isLockscreenEnabled.collect {

                logger.log(TAG, VERBOSE, "DeviceEntry isLockscreenEnabled", it)

            }

        }



        scope.launch {

            keyguardInteractor.primaryBouncerShowing.collect {

                logger.log(TAG, VERBOSE, "Primary bouncer showing", it)