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

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

Change-Id: Ie10cd534ac9a245903c1674445ef9eb17de97daf
This commit is contained in:
Etienne Ruffieux
2022-03-17 10:59:16 +00:00
committed by Automerger Merge Worker
parent 2638f38f75 1de1157d4e
commit 520a6e5a9b
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

@@ -751,7 +751,10 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
ParcelUuid[] uuids = mDevice.getUuids(); ParcelUuid[] uuids = mDevice.getUuids();
if (uuids == null) return false; 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; if (localUuids == null) return false;
/* /*

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

@@ -124,7 +124,10 @@ public class LocalBluetoothAdapter {
} }
public ParcelUuid[] getUuids() { 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() { public boolean isDiscovering() {