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

Merge "bt: Fix displaying late bond device name" into udc-dev am: 0c903d88d3

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

Change-Id: I1027a571aaf5dbbfdc485c00c4677b32038843aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Michał Narajowski
2023-05-19 20:30:34 +00:00
committed by Automerger Merge Worker
parent 535e6b4cc5 0c903d88d3
commit dbdfcf7a46
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java
View File

@@ -51,6 +51,7 @@ public class CachedBluetoothDeviceManager {
CsipDeviceManager mCsipDeviceManager;
BluetoothDevice mOngoingSetMemberPair;
boolean mIsLateBonding;
int mGroupIdOfLateBonding;
public CachedBluetoothDeviceManager(Context context, LocalBluetoothManager localBtManager) {
mContext = context;
@@ -213,6 +214,14 @@ public class CachedBluetoothDeviceManager {
* @return The name, or if unavailable, the address.
*/
public String getName(BluetoothDevice device) {
if (isOngoingPairByCsip(device)) {
CachedBluetoothDevice firstDevice =
mCsipDeviceManager.getFirstMemberDevice(mGroupIdOfLateBonding);
if (firstDevice != null && firstDevice.getName() != null) {
return firstDevice.getName();
}
}
CachedBluetoothDevice cachedDevice = findDevice(device);
if (cachedDevice != null && cachedDevice.getName() != null) {
return cachedDevice.getName();
@@ -314,6 +323,7 @@ public class CachedBluetoothDeviceManager {
// To clear the SetMemberPair flag when the Bluetooth is turning off.
mOngoingSetMemberPair = null;
mIsLateBonding = false;
mGroupIdOfLateBonding = BluetoothCsipSetCoordinator.GROUP_ID_INVALID;
}
}
@@ -426,6 +436,7 @@ public class CachedBluetoothDeviceManager {
return false;
}
Log.d(TAG, "isLateBonding: " + mIsLateBonding);
return mIsLateBonding;
}
@@ -444,11 +455,13 @@ public class CachedBluetoothDeviceManager {
Log.d(TAG, "Bond " + device.getAnonymizedAddress() + " groupId=" + groupId + " by CSIP ");
mOngoingSetMemberPair = device;
mIsLateBonding = checkLateBonding(groupId);
mGroupIdOfLateBonding = groupId;
syncConfigFromMainDevice(device, groupId);
if (!device.createBond(BluetoothDevice.TRANSPORT_LE)) {
Log.d(TAG, "Bonding could not be started");
mOngoingSetMemberPair = null;
mIsLateBonding = false;
mGroupIdOfLateBonding = BluetoothCsipSetCoordinator.GROUP_ID_INVALID;
}
}
@@ -494,6 +507,7 @@ public class CachedBluetoothDeviceManager {
mOngoingSetMemberPair = null;
mIsLateBonding = false;
mGroupIdOfLateBonding = BluetoothCsipSetCoordinator.GROUP_ID_INVALID;
if (bondState != BluetoothDevice.BOND_NONE) {
if (findDevice(device) == null) {
final LocalBluetoothProfileManager profileManager = mBtManager.getProfileManager();