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

Commit 0410f9b9 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "[API Review] Replace usage of getUuids by new SystemApi" am: e2b00d3a... 

Merge "[API Review] Replace usage of getUuids by new SystemApi" am: e2b00d3a am: 1de1157d am: 520a6e5a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2020438

Change-Id: I20adac33682b4647fd1906f80dbed55a4476325c
parents b7655c58 520a6e5a

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

+4 −1
Original line number Diff line number Diff line
@@ -753,7 +753,10 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        ParcelUuid[] uuids = mDevice.getUuids();

        if (uuids == null) return false;



        ParcelUuid[] localUuids = mLocalAdapter.getUuids();

        List<ParcelUuid> uuidsList = mLocalAdapter.getUuidsList();

        ParcelUuid[] localUuids = new ParcelUuid[uuidsList.size()];

        uuidsList.toArray(localUuids);



        if (localUuids == null) return false;



        /*

packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java

+4 −1
Original line number Diff line number Diff line
@@ -126,7 +126,10 @@ public class LocalBluetoothAdapter { 
    }



    public ParcelUuid[] getUuids() {

        return mAdapter.getUuids();

        List<ParcelUuid> uuidsList = mAdapter.getUuidsList();

        ParcelUuid[] uuidsArray = new ParcelUuid[uuidsList.size()];

        uuidsList.toArray(uuidsArray);

        return uuidsArray;

    }



    public boolean isDiscovering() {