Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[API Review] Replace usage of getUuids by new SystemApi" am: e2b00d3a7d am: 1de1157d4e am: 520a6e5a9b

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

Change-Id: I20adac33682b4647fd1906f80dbed55a4476325c
This commit is contained in:
Etienne Ruffieux
2022-03-17 11:00:34 +00:00
committed by Automerger Merge Worker
parent b7655c5802 520a6e5a9b
commit 0410f9b91c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
View File

@@ -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;
/*

5
packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java
View File

@@ -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() {