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

Commit 79e19184 authored by Evan Chen's avatar Evan Chen Committed by Android (Google) Code Review
Browse files

Merge "Add deviceId in AssociaitonInfo" into main

parents 3e82e684 66d518d6

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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);