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

Commit 02eec37f authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "More exhaustive logs from NotificationWakeUpCoordinator" into... 

Merge "More exhaustive logs from NotificationWakeUpCoordinator" into tm-qpr-dev am: e845bc28 am: a1fbdd0a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20712497



Change-Id: I3ebe51ffd1d955e4f3272aa612e41d565585b929
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 55abc615 a1fbdd0a

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt

+3 −6
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ class NotificationWakeUpCoordinator @Inject constructor( 
    }



    override fun onDozeAmountChanged(linear: Float, eased: Float) {

        logger.logOnDozeAmountChanged(linear, eased)

        logger.logOnDozeAmountChanged(linear = linear, eased = eased)

        if (overrideDozeAmountIfAnimatingScreenOff(linear)) {

            return

        }
@@ -263,6 +263,7 @@ class NotificationWakeUpCoordinator @Inject constructor( 


    fun setDozeAmount(linear: Float, eased: Float, source: String) {

        val changed = linear != mLinearDozeAmount

        logger.logSetDozeAmount(linear, eased, source, statusBarStateController.state, changed)

        mLinearDozeAmount = linear

        mDozeAmount = eased

        mDozeAmountSource = source
@@ -276,7 +277,7 @@ class NotificationWakeUpCoordinator @Inject constructor( 
    }



    override fun onStateChanged(newState: Int) {

        logger.logOnStateChanged(newState)

        logger.logOnStateChanged(newState = newState, storedState = state)

        if (state == StatusBarState.SHADE && newState == StatusBarState.SHADE) {

            // The SHADE -> SHADE transition is only possible as part of cancelling the screen-off

            // animation (e.g. by fingerprint unlock).  This is done because the system is in an
@@ -324,12 +325,8 @@ class NotificationWakeUpCoordinator @Inject constructor( 
    private fun overrideDozeAmountIfBypass(): Boolean {

        if (bypassController.bypassEnabled) {

            if (statusBarStateController.state == StatusBarState.KEYGUARD) {

                logger.logSetDozeAmount("1.0", "1.0",

                        "Override: bypass (keyguard)", StatusBarState.KEYGUARD)

                setDozeAmount(1f, 1f, source = "Override: bypass (keyguard)")

            } else {

                logger.logSetDozeAmount("0.0", "0.0",

                        "Override: bypass (shade)", statusBarStateController.state)

                setDozeAmount(0f, 0f, source = "Override: bypass (shade)")

            }

            return true

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinatorLogger.kt

+29 −7
Original line number Diff line number Diff line
@@ -16,22 +16,33 @@ package com.android.systemui.statusbar.notification 
import com.android.systemui.log.dagger.NotificationLog

import com.android.systemui.plugins.log.LogBuffer

import com.android.systemui.plugins.log.LogLevel.DEBUG

import com.android.systemui.statusbar.StatusBarState

import javax.inject.Inject



class NotificationWakeUpCoordinatorLogger

@Inject

constructor(@NotificationLog private val buffer: LogBuffer) {

    fun logSetDozeAmount(linear: String, eased: String, source: String, state: Int) {

    fun logSetDozeAmount(

        linear: Float,

        eased: Float,

        source: String,

        state: Int,

        changed: Boolean,

    ) {

        buffer.log(

            TAG,

            DEBUG,

            {

                str1 = linear

                str2 = eased

                double1 = linear.toDouble()

                str2 = eased.toString()

                str3 = source

                int1 = state

                bool1 = changed

            },

            { "setDozeAmount: linear: $str1, eased: $str2, source: $str3, state: $int1" }

            {

                "setDozeAmount(linear=$double1, eased=$str2, source=$str3)" +

                    " state=${StatusBarState.toString(int1)} changed=$bool1"

            }

        )

    }
@@ -43,12 +54,23 @@ constructor(@NotificationLog private val buffer: LogBuffer) { 
                double1 = linear.toDouble()

                str2 = eased.toString()

            },

            { "onDozeAmountChanged($double1, $str2)" }

            { "onDozeAmountChanged(linear=$double1, eased=$str2)" }

        )

    }



    fun logOnStateChanged(newState: Int) {

        buffer.log(TAG, DEBUG, { int1 = newState }, { "onStateChanged($int1)" })

    fun logOnStateChanged(newState: Int, storedState: Int) {

        buffer.log(

            TAG,

            DEBUG,

            {

                int1 = newState

                int2 = storedState

            },

            {

                "onStateChanged(newState=${StatusBarState.toString(int1)})" +

                    " stored=${StatusBarState.toString(int2)}"

            }

        )

    }

}