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

Commit 34076df1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I77fed50b,Icb963b0c,Id1d683d8,I91d9ccc5 into main am: f52b5811 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3056625



Change-Id: Ia963bc371271bcfc96cb6040e2a7a46f752b9ff1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0bc5b3ee f52b5811

android/app/src/com/android/bluetooth/Utils.java

+9 −2
Original line number Diff line number Diff line
@@ -250,14 +250,21 @@ public final class Utils { 
        return identity != null ? identity : address;

    }



    /**

     * @see #getByteBrEdrAddress(AdapterService, BluetoothDevice)

     */

    public static byte[] getByteBrEdrAddress(BluetoothDevice device) {

        return getByteBrEdrAddress(AdapterService.getAdapterService(), device);

    }



    /**

     * Returns the correct device address to be used for connections over BR/EDR transport.

     *

     * @param service the provided AdapterService

     * @param device the device for which to obtain the connection address

     * @return either identity address or device address as a byte array

     */

    public static byte[] getByteBrEdrAddress(BluetoothDevice device) {

        final AdapterService service = AdapterService.getAdapterService();

    public static byte[] getByteBrEdrAddress(AdapterService service, BluetoothDevice device) {

        // If dual mode device bonded over BLE first, BR/EDR address will be identity address

        // Otherwise, BR/EDR address will be same address as in BluetoothDevice#getAddress

        byte[] address = service.getByteIdentityAddress(device);

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+0 −1
Original line number Diff line number Diff line
@@ -5432,7 +5432,6 @@ public class AdapterService extends Service { 
     * @param device the remote device that we want to get UUIDs from

     * @return the uuids of the remote device

     */

    @VisibleForTesting

    public ParcelUuid[] getRemoteUuids(BluetoothDevice device) {

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp == null) {