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

Commit 3ca74be0 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "[Media TTT] Move the unhandled state logging into the LogBuffer with... 

Merge "[Media TTT] Move the unhandled state logging into the LogBuffer with all the other logs." into tm-qpr-dev am: 49ecf60f

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



Change-Id: I191f102cddc882b7b8f974883f34685335ab6fb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b0baad68 49ecf60f

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

+15 −0
Original line number Diff line number Diff line
@@ -43,6 +43,21 @@ class MediaTttLogger( 
        )

    }



    /**

     * Logs an error in trying to update to [displayState].

     *

     * [displayState] is either a [android.app.StatusBarManager.MediaTransferSenderState] or

     * a [android.app.StatusBarManager.MediaTransferReceiverState].

     */

    fun logStateChangeError(displayState: Int) {

        buffer.log(

            tag,

            LogLevel.ERROR,

            { int1 = displayState },

            { "Cannot display state=$int1; aborting" }

        )

    }



    /** Logs that we couldn't find information for [packageName]. */

    fun logPackageNotFound(packageName: String) {

        buffer.log(

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

+1 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.graphics.drawable.Icon 
import android.media.MediaRoute2Info

import android.os.Handler

import android.os.PowerManager

import android.util.Log

import android.view.Gravity

import android.view.View

import android.view.ViewGroup
@@ -116,7 +115,7 @@ class MediaTttChipControllerReceiver @Inject constructor( 
        logger.logStateChange(stateName, routeInfo.id, routeInfo.clientPackageName)



        if (chipState == null) {

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

            logger.logStateChangeError(displayState)

            return

        }

        uiEventLogger.logReceiverStateChange(chipState)
@@ -236,5 +235,3 @@ data class ChipReceiverInfo( 
) : TemporaryViewInfo {

    override fun getTimeoutMs() = DEFAULT_TIMEOUT_MILLIS

}
 


private const val RECEIVER_TAG = "MediaTapToTransferRcvr"

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

+1 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.systemui.media.taptotransfer.sender 
import android.app.StatusBarManager

import android.content.Context

import android.media.MediaRoute2Info

import android.util.Log

import android.view.View

import com.android.internal.logging.UiEventLogger

import com.android.internal.statusbar.IUndoMediaTransferCallback
@@ -34,7 +33,6 @@ import com.android.systemui.statusbar.CommandQueue 
import com.android.systemui.temporarydisplay.chipbar.ChipbarCoordinator

import com.android.systemui.temporarydisplay.chipbar.ChipbarEndItem

import com.android.systemui.temporarydisplay.chipbar.ChipbarInfo

import com.android.systemui.temporarydisplay.chipbar.SENDER_TAG

import javax.inject.Inject



/**
@@ -86,7 +84,7 @@ constructor( 
        logger.logStateChange(stateName, routeInfo.id, routeInfo.clientPackageName)



        if (chipState == null) {

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

            logger.logStateChangeError(displayState)

            return

        }

        uiEventLogger.logSenderStateChange(chipState)

packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt

+0 −1
Original line number Diff line number Diff line
@@ -204,5 +204,4 @@ open class ChipbarCoordinator @Inject constructor( 
    }

}



const val SENDER_TAG = "MediaTapToTransferSender"

private const val ANIMATION_DURATION = 500L