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

Commit 28d58530 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Media TTT] Also log the package name on each state change. 

Bug: 246574567
Test: verified logs in logcat show package name
Test: media.taptotransfer tests
Change-Id: I01cd3be5320b6e484c1cf41b0b5eba32d81abd61
parent 1d776d63

packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttLogger.kt

+3 −2
Original line number Diff line number Diff line
@@ -29,15 +29,16 @@ class MediaTttLogger( 
    private val buffer: LogBuffer

){

    /** Logs a change in the chip state for the given [mediaRouteId]. */

    fun logStateChange(stateName: String, mediaRouteId: String) {

    fun logStateChange(stateName: String, mediaRouteId: String, packageName: String?) {

        buffer.log(

            BASE_TAG + deviceTypeTag,

            LogLevel.DEBUG,

            {

                str1 = stateName

                str2 = mediaRouteId

                str3 = packageName

            },

            { "State changed to $str1 for ID=$str2" }

            { "State changed to $str1 for ID=$str2 package=$str3" }

        )

    }

packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ class MediaTttChipControllerReceiver @Inject constructor( 
    ) {

        val chipState: ChipStateReceiver? = ChipStateReceiver.getReceiverStateFromId(displayState)

        val stateName = chipState?.name ?: "Invalid"

        logger.logStateChange(stateName, routeInfo.id)

        logger.logStateChange(stateName, routeInfo.id, routeInfo.clientPackageName)



        if (chipState == null) {

            Log.e(RECEIVER_TAG, "Unhandled MediaTransferReceiverState $displayState")

packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ class MediaTttChipControllerSender @Inject constructor( 
    ) {

        val chipState: ChipStateSender? = ChipStateSender.getSenderStateFromId(displayState)

        val stateName = chipState?.name ?: "Invalid"

        logger.logStateChange(stateName, routeInfo.id)

        logger.logStateChange(stateName, routeInfo.id, routeInfo.clientPackageName)



        if (chipState == null) {

            Log.e(SENDER_TAG, "Unhandled MediaTransferSenderState $displayState")

packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/common/MediaTttLoggerTest.kt

+6 −4
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ import com.android.systemui.log.LogBuffer 
import com.android.systemui.log.LogBufferFactory

import com.android.systemui.log.LogcatEchoTracker

import com.google.common.truth.Truth.assertThat

import java.io.PrintWriter

import java.io.StringWriter

import org.junit.Before

import org.junit.Test

import org.mockito.Mockito.mock

import java.io.PrintWriter

import java.io.StringWriter



@SmallTest

class MediaTttLoggerTest : SysuiTestCase() {
@@ -43,11 +43,12 @@ class MediaTttLoggerTest : SysuiTestCase() { 
    }



    @Test

    fun logStateChange_bufferHasDeviceTypeTagAndStateNameAndId() {

    fun logStateChange_bufferHasDeviceTypeTagAndParamInfo() {

        val stateName = "test state name"

        val id = "test id"

        val packageName = "this.is.a.package"



        logger.logStateChange(stateName, id)

        logger.logStateChange(stateName, id, packageName)



        val stringWriter = StringWriter()

        buffer.dump(PrintWriter(stringWriter), tailLength = 0)
@@ -56,6 +57,7 @@ class MediaTttLoggerTest : SysuiTestCase() { 
        assertThat(actualString).contains(DEVICE_TYPE_TAG)

        assertThat(actualString).contains(stateName)

        assertThat(actualString).contains(id)

        assertThat(actualString).contains(packageName)

    }



    @Test

packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiverTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ class MediaTttChipControllerReceiverTest : SysuiTestCase() { 
            null

        )



        verify(logger).logStateChange(any(), any())

        verify(logger).logStateChange(any(), any(), any())

    }



    @Test