Add support for arbitrary properties of fake devices

Test: existing
Bug: N/A
Change-Id: I656f3f020d469f7a063d9649f6cb1eeb32590662

6 files changed, 13 insertions, 23 deletions

diff --git a/android-adb/testSrc/com/android/tools/idea/adblib/ddmlibcompatibility/ShellTest.kt b/android-adb/testSrc/com/android/tools/idea/adblib/ddmlibcompatibility/ShellTest.kt
index e43404c27b4..4b22de5b438 100644
--- a/android-adb/testSrc/com/android/tools/idea/adblib/ddmlibcompatibility/ShellTest.kt
+++ b/android-adb/testSrc/com/android/tools/idea/adblib/ddmlibcompatibility/ShellTest.kt
@@ -55,11 +55,11 @@ class ShellTest {
     val expected = """# This is some build info
 # This is more build info
 
+[ro.build.version.release]: [versionX]
+[ro.build.version.sdk]: [29]
 [ro.product.cpu.abi]: [arm64-v8a]
 [ro.product.manufacturer]: [Google]
 [ro.product.model]: [Pix3l]
-[ro.build.version.release]: [versionX]
-[ro.build.version.sdk]: [29]
 """
     assertThat(receiver.lines.joinToString("\n")).isEqualTo(expected)
     TestLoggerFactory.dumpLogToStdout("foo")
diff --git a/app-inspection/api/testSrc/com/android/tools/idea/appinspection/internal/process/DebuggableProcessFilterTest.kt b/app-inspection/api/testSrc/com/android/tools/idea/appinspection/internal/process/DebuggableProcessFilterTest.kt
index ca36b4a4b58..4c56b272e6f 100644
--- a/app-inspection/api/testSrc/com/android/tools/idea/appinspection/internal/process/DebuggableProcessFilterTest.kt
+++ b/app-inspection/api/testSrc/com/android/tools/idea/appinspection/internal/process/DebuggableProcessFilterTest.kt
@@ -33,7 +33,7 @@ class DebuggableProcessFilterTest {
 
   @Test
   fun testIsProcessDebuggable() {
-    adbRule.attachDevice("emulator-123", "Google", "Pixel", "29", "29", "arm64-v8a", USB, "MyAvd", "/path")
+    adbRule.attachDevice("emulator-123", "Google", "Pixel", "29", "29", "arm64-v8a", emptyMap(), USB, "MyAvd", "/path")
     val device: IDevice = adbRule.bridge.devices.single()
     assertThat(device.isPackageDebuggable("com.google.android.webview")).isFalse()
     assertThat(device.isPackageDebuggable("androidx.compose.ui.test")).isTrue()
diff --git a/emulator/testSrc/com/android/tools/idea/device/DeviceToolWindowPanelTest.kt b/emulator/testSrc/com/android/tools/idea/device/DeviceToolWindowPanelTest.kt
index fcb9b8fd54d..ee5018d2539 100644
--- a/emulator/testSrc/com/android/tools/idea/device/DeviceToolWindowPanelTest.kt
+++ b/emulator/testSrc/com/android/tools/idea/device/DeviceToolWindowPanelTest.kt
@@ -281,7 +281,7 @@ class DeviceToolWindowPanelTest {
   }
 
   private fun createToolWindowPanel(): DeviceToolWindowPanel {
-    val panel = DeviceToolWindowPanel(project, device.serialNumber, device.deviceState.cpuAbi, "Test device", device.deviceProperties)
+    val panel = DeviceToolWindowPanel(project, device.serialNumber, device.deviceState.cpuAbi, "Test device", device.properties)
     Disposer.register(testRootDisposable) {
       if (panel.deviceView != null) {
         panel.destroyContent()
diff --git a/emulator/testSrc/com/android/tools/idea/device/FakeScreenSharingAgentRule.kt b/emulator/testSrc/com/android/tools/idea/device/FakeScreenSharingAgentRule.kt
index 19a4868b527..28c006558f0 100644
--- a/emulator/testSrc/com/android/tools/idea/device/FakeScreenSharingAgentRule.kt
+++ b/emulator/testSrc/com/android/tools/idea/device/FakeScreenSharingAgentRule.kt
@@ -15,11 +15,6 @@
  */
 package com.android.tools.idea.device
 
-import com.android.adblib.DevicePropertyNames.RO_BUILD_VERSION_RELEASE
-import com.android.adblib.DevicePropertyNames.RO_BUILD_VERSION_SDK
-import com.android.adblib.DevicePropertyNames.RO_PRODUCT_CPU_ABI
-import com.android.adblib.DevicePropertyNames.RO_PRODUCT_MANUFACTURER
-import com.android.adblib.DevicePropertyNames.RO_PRODUCT_MODEL
 import com.android.ddmlib.testing.FakeAdbRule
 import com.android.fakeadbserver.DeviceState
 import com.android.fakeadbserver.FakeAdbServer
@@ -133,15 +128,9 @@ internal class FakeScreenSharingAgentRule : TestRule {
                     hostConnectionType: DeviceState.HostConnectionType = DeviceState.HostConnectionType.USB): FakeDevice {
     val serialNumber = (++deviceCounter).toString()
     val release = "Sweet dessert"
-    val deviceState = fakeAdbRule.attachDevice(serialNumber, manufacturer, model, release, apiLevel.toString(), abi, hostConnectionType)
-    val deviceProperties = mapOf(
-      RO_BUILD_VERSION_RELEASE to release,
-      RO_BUILD_VERSION_SDK to apiLevel.toString(),
-      RO_PRODUCT_CPU_ABI to abi,
-      RO_PRODUCT_MANUFACTURER to manufacturer,
-      RO_PRODUCT_MODEL to model,
-    )
-    val device = FakeDevice(serialNumber, displaySize, deviceState, deviceProperties + additionalDeviceProperties)
+    val deviceState = fakeAdbRule.attachDevice(serialNumber, manufacturer, model, release, apiLevel.toString(), abi,
+                                               additionalDeviceProperties, hostConnectionType)
+    val device = FakeDevice(serialNumber, displaySize, deviceState)
     devices.add(device)
     return device
   }
@@ -165,9 +154,10 @@ internal class FakeScreenSharingAgentRule : TestRule {
     val serialNumber: String,
     val displaySize: Dimension,
     val deviceState: DeviceState,
-    val deviceProperties: Map<String, String>,
   ) {
     val agent: FakeScreenSharingAgent = FakeScreenSharingAgent(displaySize, deviceState)
     var hostPort: Int? = null
+    val properties: Map<String, String>
+      get() = deviceState.properties
   }
 }
\ No newline at end of file
diff --git a/layout-inspector/testSrc/com/android/tools/idea/layoutinspector/pipeline/appinspection/AppInspectionInspectorClientTest.kt b/layout-inspector/testSrc/com/android/tools/idea/layoutinspector/pipeline/appinspection/AppInspectionInspectorClientTest.kt
index d0ccbecbf55..18b05fa5877 100644
--- a/layout-inspector/testSrc/com/android/tools/idea/layoutinspector/pipeline/appinspection/AppInspectionInspectorClientTest.kt
+++ b/layout-inspector/testSrc/com/android/tools/idea/layoutinspector/pipeline/appinspection/AppInspectionInspectorClientTest.kt
@@ -1036,7 +1036,7 @@ class AppInspectionInspectorClientWithUnsupportedApi29 {
 
     inspectorRule.adbRule.attachDevice(
       processDescriptor.device.serial, processDescriptor.device.manufacturer, processDescriptor.device.model,
-      processDescriptor.device.version, processDescriptor.device.apiLevel.toString(), processDescriptor.abiCpuArch,
+      processDescriptor.device.version, processDescriptor.device.apiLevel.toString(), processDescriptor.abiCpuArch, emptyMap(),
       DeviceState.HostConnectionType.LOCAL, "myAvd-$apiLevel", "/android/avds/myAvd-$apiLevel"
     )
 
diff --git a/layout-inspector/testSrc/com/android/tools/idea/layoutinspector/pipeline/appinspection/ComposeLayoutInspectorClientTest.kt b/layout-inspector/testSrc/com/android/tools/idea/layoutinspector/pipeline/appinspection/ComposeLayoutInspectorClientTest.kt
index 4e158c0d3fb..d3f0e7e2ceb 100644
--- a/layout-inspector/testSrc/com/android/tools/idea/layoutinspector/pipeline/appinspection/ComposeLayoutInspectorClientTest.kt
+++ b/layout-inspector/testSrc/com/android/tools/idea/layoutinspector/pipeline/appinspection/ComposeLayoutInspectorClientTest.kt
@@ -78,7 +78,7 @@ class ComposeLayoutInspectorClientTest {
   fun testClientCreation() = runBlocking {
     adbRule.attachDevice(processDescriptor.device.serial, processDescriptor.device.manufacturer, processDescriptor.device.model,
                          processDescriptor.device.version, processDescriptor.device.apiLevel.toString(),
-                         "arm64-v8a", DeviceState.HostConnectionType.LOCAL, "myAvd", "/android/avds/myAvd")
+                         "arm64-v8a", emptyMap(), DeviceState.HostConnectionType.LOCAL, "myAvd", "/android/avds/myAvd")
 
     val artifactService = mock<InspectorArtifactService>()
     val messenger = mock<AppInspectorMessenger>()
@@ -103,7 +103,7 @@ class ComposeLayoutInspectorClientTest {
   fun inspectorArtifactNotFound_showUseSnapshotBanner() = runBlocking {
     adbRule.attachDevice(processDescriptor.device.serial, processDescriptor.device.manufacturer, processDescriptor.device.model,
                          processDescriptor.device.version, processDescriptor.device.apiLevel.toString(),
-                         "arm64-v8a", DeviceState.HostConnectionType.LOCAL, "myAvd", "/android/avds/myAvd")
+                         "arm64-v8a", emptyMap(), DeviceState.HostConnectionType.LOCAL, "myAvd", "/android/avds/myAvd")
 
     val artifactService = object : InspectorArtifactService {
       override suspend fun getOrResolveInspectorArtifact(artifactCoordinate: ArtifactCoordinate, project: Project): Path {
@@ -130,7 +130,7 @@ class ComposeLayoutInspectorClientTest {
   fun inspectorArtifactNotFound_showComposeInspectionNotAvailableBanner() = runBlocking {
     adbRule.attachDevice(processDescriptor.device.serial, processDescriptor.device.manufacturer, processDescriptor.device.model,
                          processDescriptor.device.version, processDescriptor.device.apiLevel.toString(),
-                         "arm64-v8a", DeviceState.HostConnectionType.LOCAL, "myAvd", "/android/avds/myAvd")
+                         "arm64-v8a", emptyMap(), DeviceState.HostConnectionType.LOCAL, "myAvd", "/android/avds/myAvd")
 
     val artifactService = object : InspectorArtifactService {
       override suspend fun getOrResolveInspectorArtifact(artifactCoordinate: ArtifactCoordinate, project: Project): Path {