Merge "Add deviceId in AssociaitonInfo" into main

This commit is contained in:
Evan Chen
2024-11-27 21:06:08 +00:00
committed by Android (Google) Code Review

View File

@@ -104,7 +104,6 @@ public class BluetoothDetailsCompanionAppsControllerTest extends
associationId, associationId,
/* userId */ 0, /* userId */ 0,
packageName, packageName,
/* tag */ null,
MacAddress.fromString(mCachedDevice.getAddress()), MacAddress.fromString(mCachedDevice.getAddress()),
/* displayName */ null, /* displayName */ null,
/* deviceProfile */ "", /* deviceProfile */ "",
@@ -116,7 +115,8 @@ public class BluetoothDetailsCompanionAppsControllerTest extends
/* timeApprovedMs */ System.currentTimeMillis(), /* timeApprovedMs */ System.currentTimeMillis(),
/* lastTimeConnected */ Long.MAX_VALUE, /* lastTimeConnected */ Long.MAX_VALUE,
/* systemDataSyncFlags */ -1, /* systemDataSyncFlags */ -1,
/* deviceIcon */ null); /* deviceIcon */ null,
/* deviceId */ null);
mAssociations.add(association); mAssociations.add(association);
showScreen(mController); showScreen(mController);