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

Commit 36f5b9a8 authored by Caitlin Cassidy's avatar Caitlin Cassidy
Browse files

[Media TTT] Use clientPackageName instead of packageName to fetch 

transfer application info.

The client who's notifying SysUI of the transfer needs to create a new
MediaRoute2Info object to inform us about the media route, and they're
only able to access `setClientPackageName`, not `setPackageName`.

Fixes: 241930323
Test: manual
Test: media.taptotransfer tests
Change-Id: Ie17f561d3390ef0daf85a9343f74b3d46355a008
parent 1836acc9

packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelper.kt

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ class MediaTttCommandLineHelper @Inject constructor( 
                    .addFeature("feature")

            val useAppIcon = !(args.size >= 3 && args[2] == "useAppIcon=false")

            if (useAppIcon) {

                routeInfo.setPackageName(TEST_PACKAGE_NAME)

                routeInfo.setClientPackageName(TEST_PACKAGE_NAME)

            }



            statusBarManager.updateMediaTapToTransferSenderDisplay(
@@ -134,7 +134,7 @@ class MediaTttCommandLineHelper @Inject constructor( 
                .addFeature("feature")

            val useAppIcon = !(args.size >= 2 && args[1] == "useAppIcon=false")

            if (useAppIcon) {

                routeInfo.setPackageName(TEST_PACKAGE_NAME)

                routeInfo.setClientPackageName(TEST_PACKAGE_NAME)

            }



            statusBarManager.updateMediaTapToTransferReceiverDisplay(

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

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ class MediaTttChipControllerReceiver @Inject constructor( 
        super.updateChipView(newChipInfo, currentChipView)

        setIcon(

                currentChipView,

                newChipInfo.routeInfo.packageName,

                newChipInfo.routeInfo.clientPackageName,

                newChipInfo.appIconDrawableOverride,

                newChipInfo.appNameOverride

        )

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

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ class MediaTttChipControllerSender @Inject constructor( 
        val chipState = newChipInfo.state



        // App icon

        val iconName = setIcon(currentChipView, newChipInfo.routeInfo.packageName)

        val iconName = setIcon(currentChipView, newChipInfo.routeInfo.clientPackageName)



        // Text

        val otherDeviceName = newChipInfo.routeInfo.name.toString()

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

+1 −1
Original line number Diff line number Diff line
@@ -241,5 +241,5 @@ private const val PACKAGE_NAME = "com.android.systemui" 


private val routeInfo = MediaRoute2Info.Builder("id", "Test route name")

    .addFeature("feature")

    .setPackageName(PACKAGE_NAME)

    .setClientPackageName(PACKAGE_NAME)

    .build()

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

+1 −1
Original line number Diff line number Diff line
@@ -686,5 +686,5 @@ private const val TIMEOUT = 10000 


private val routeInfo = MediaRoute2Info.Builder("id", OTHER_DEVICE_NAME)

    .addFeature("feature")

    .setPackageName(PACKAGE_NAME)

    .setClientPackageName(PACKAGE_NAME)

    .build()