diff options
4 files changed, 17 insertions, 8 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttLogger.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttLogger.kt index 38c971ed3f7d..120f7d673881 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttLogger.kt @@ -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( diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt index 089625ca8d9c..dc794e66b918 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt @@ -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" diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinator.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinator.kt index edf759ddfd22..1fa8faeecd82 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinator.kt @@ -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) diff --git a/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt b/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt index cd7bd2dae8fd..b8930a45cd33 100644 --- a/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt @@ -204,5 +204,4 @@ open class ChipbarCoordinator @Inject constructor( } } -const val SENDER_TAG = "MediaTapToTransferSender" private const val ANIMATION_DURATION = 500L |