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

Browse Source
This commit is contained in:
Michał Narajowski
2023-05-19 19:51:00 +00:00
committed by Android (Google) Code Review
parent 8e3c3bd264 c16970217d
commit 0c903d88d3
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; CsipDeviceManager mCsipDeviceManager;
BluetoothDevice mOngoingSetMemberPair; BluetoothDevice mOngoingSetMemberPair;
boolean mIsLateBonding; boolean mIsLateBonding;
int mGroupIdOfLateBonding;
public CachedBluetoothDeviceManager(Context context, LocalBluetoothManager localBtManager) { public CachedBluetoothDeviceManager(Context context, LocalBluetoothManager localBtManager) {
mContext = context; mContext = context;
@@ -213,6 +214,14 @@ public class CachedBluetoothDeviceManager {
* @return The name, or if unavailable, the address. * @return The name, or if unavailable, the address.
*/ */
public String getName(BluetoothDevice device) { 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); CachedBluetoothDevice cachedDevice = findDevice(device);
if (cachedDevice != null && cachedDevice.getName() != null) { if (cachedDevice != null && cachedDevice.getName() != null) {
return cachedDevice.getName(); return cachedDevice.getName();
@@ -314,6 +323,7 @@ public class CachedBluetoothDeviceManager {
// To clear the SetMemberPair flag when the Bluetooth is turning off. // To clear the SetMemberPair flag when the Bluetooth is turning off.
mOngoingSetMemberPair = null; mOngoingSetMemberPair = null;
mIsLateBonding = false; mIsLateBonding = false;
mGroupIdOfLateBonding = BluetoothCsipSetCoordinator.GROUP_ID_INVALID;
} }
} }
@@ -426,6 +436,7 @@ public class CachedBluetoothDeviceManager {
return false; return false;
} }
Log.d(TAG, "isLateBonding: " + mIsLateBonding);
return mIsLateBonding; return mIsLateBonding;
} }
@@ -444,11 +455,13 @@ public class CachedBluetoothDeviceManager {
Log.d(TAG, "Bond " + device.getAnonymizedAddress() + " groupId=" + groupId + " by CSIP "); Log.d(TAG, "Bond " + device.getAnonymizedAddress() + " groupId=" + groupId + " by CSIP ");
mOngoingSetMemberPair = device; mOngoingSetMemberPair = device;
mIsLateBonding = checkLateBonding(groupId); mIsLateBonding = checkLateBonding(groupId);
mGroupIdOfLateBonding = groupId;
syncConfigFromMainDevice(device, groupId); syncConfigFromMainDevice(device, groupId);
if (!device.createBond(BluetoothDevice.TRANSPORT_LE)) { if (!device.createBond(BluetoothDevice.TRANSPORT_LE)) {
Log.d(TAG, "Bonding could not be started"); Log.d(TAG, "Bonding could not be started");
mOngoingSetMemberPair = null; mOngoingSetMemberPair = null;
mIsLateBonding = false; mIsLateBonding = false;
mGroupIdOfLateBonding = BluetoothCsipSetCoordinator.GROUP_ID_INVALID;
} }
} }
@@ -494,6 +507,7 @@ public class CachedBluetoothDeviceManager {
mOngoingSetMemberPair = null; mOngoingSetMemberPair = null;
mIsLateBonding = false; mIsLateBonding = false;
mGroupIdOfLateBonding = BluetoothCsipSetCoordinator.GROUP_ID_INVALID;
if (bondState != BluetoothDevice.BOND_NONE) { if (bondState != BluetoothDevice.BOND_NONE) {
if (findDevice(device) == null) { if (findDevice(device) == null) {
final LocalBluetoothProfileManager profileManager = mBtManager.getProfileManager(); final LocalBluetoothProfileManager profileManager = mBtManager.getProfileManager();