Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Media TTT] Use clientPackageName instead of packageName to fetch transfer application info." into tm-qpr-dev

Browse Source
This commit is contained in:
Caitlin Cassidy
2022-08-16 16:26:39 +00:00
committed by Android (Google) Code Review
parent ae8173760e 36f5b9a826
commit 7738b57021
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ class MediaTttCommandLineHelper @Inject constructor(
.addFeature("feature") .addFeature("feature")
val useAppIcon = !(args.size >= 3 && args[2] == "useAppIcon=false") val useAppIcon = !(args.size >= 3 && args[2] == "useAppIcon=false")
if (useAppIcon) { if (useAppIcon) {
routeInfo.setPackageName(TEST_PACKAGE_NAME) routeInfo.setClientPackageName(TEST_PACKAGE_NAME)
} }
statusBarManager.updateMediaTapToTransferSenderDisplay( statusBarManager.updateMediaTapToTransferSenderDisplay(
@@ -134,7 +134,7 @@ class MediaTttCommandLineHelper @Inject constructor(
.addFeature("feature") .addFeature("feature")
val useAppIcon = !(args.size >= 2 && args[1] == "useAppIcon=false") val useAppIcon = !(args.size >= 2 && args[1] == "useAppIcon=false")
if (useAppIcon) { if (useAppIcon) {
routeInfo.setPackageName(TEST_PACKAGE_NAME) routeInfo.setClientPackageName(TEST_PACKAGE_NAME)
} }
statusBarManager.updateMediaTapToTransferReceiverDisplay( statusBarManager.updateMediaTapToTransferReceiverDisplay(

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

@@ -143,7 +143,7 @@ class MediaTttChipControllerReceiver @Inject constructor(
super.updateChipView(newChipInfo, currentChipView) super.updateChipView(newChipInfo, currentChipView)
setIcon( setIcon(
currentChipView, currentChipView,
newChipInfo.routeInfo.packageName, newChipInfo.routeInfo.clientPackageName,
newChipInfo.appIconDrawableOverride, newChipInfo.appIconDrawableOverride,
newChipInfo.appNameOverride newChipInfo.appNameOverride
) )

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

@@ -122,7 +122,7 @@ class MediaTttChipControllerSender @Inject constructor(
val chipState = newChipInfo.state val chipState = newChipInfo.state
// App icon // App icon
val iconName = setIcon(currentChipView, newChipInfo.routeInfo.packageName) val iconName = setIcon(currentChipView, newChipInfo.routeInfo.clientPackageName)
// Text // Text
val otherDeviceName = newChipInfo.routeInfo.name.toString() val otherDeviceName = newChipInfo.routeInfo.name.toString()

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

@@ -241,5 +241,5 @@ private const val PACKAGE_NAME = "com.android.systemui"
private val routeInfo = MediaRoute2Info.Builder("id", "Test route name") private val routeInfo = MediaRoute2Info.Builder("id", "Test route name")
.addFeature("feature") .addFeature("feature")
.setPackageName(PACKAGE_NAME) .setClientPackageName(PACKAGE_NAME)
.build() .build()

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

@@ -686,5 +686,5 @@ private const val TIMEOUT = 10000
private val routeInfo = MediaRoute2Info.Builder("id", OTHER_DEVICE_NAME) private val routeInfo = MediaRoute2Info.Builder("id", OTHER_DEVICE_NAME)
.addFeature("feature") .addFeature("feature")
.setPackageName(PACKAGE_NAME) .setClientPackageName(PACKAGE_NAME)
.build() .build()