Merge "Add deviceId in AssociaitonInfo" into main

2024-11-27 21:06:08 +00:00
parent 3e82e6840e 66d518d666
commit 79e1918413
1 changed files with 2 additions and 2 deletions
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java
@@ -104,7 +104,6 @@ public class BluetoothDetailsCompanionAppsControllerTest extends
                associationId,
                /* userId */ 0,
                packageName,
-                /* tag */ null,
                MacAddress.fromString(mCachedDevice.getAddress()),
                /* displayName */ null,
                /* deviceProfile */ "",
@@ -116,7 +115,8 @@ public class BluetoothDetailsCompanionAppsControllerTest extends
                /* timeApprovedMs */ System.currentTimeMillis(),
                /* lastTimeConnected */ Long.MAX_VALUE,
                /* systemDataSyncFlags */ -1,
-                /* deviceIcon */ null);
+                /* deviceIcon */ null,
+                /* deviceId */ null);

        mAssociations.add(association);
        showScreen(mController);