PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "New hearing device pairing page: ignore bonded device" into main

Browse Source
This commit is contained in:
Angela Wang
2024-02-07 12:31:51 +00:00
committed by Android (Google) Code Review
parent c9875fc836 4972c58783
commit 65dcdcbdd8
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/accessibility/HearingDevicePairingFragment.java
View File

@@ -192,7 +192,7 @@ public class HearingDevicePairingFragment extends RestrictedDashboardFragment im
public void onDeviceBondStateChanged(@NonNull CachedBluetoothDevice cachedDevice, public void onDeviceBondStateChanged(@NonNull CachedBluetoothDevice cachedDevice,
int bondState) { int bondState) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "onDeviceBondStateChanged: " + cachedDevice.getName() + ", state = " Log.d(TAG, "onDeviceBondStateChanged: " + cachedDevice.getDevice() + ", state = "
+ bondState); + bondState);
} }
if (bondState == BluetoothDevice.BOND_BONDED) { if (bondState == BluetoothDevice.BOND_BONDED) {
@@ -276,13 +276,13 @@ public class HearingDevicePairingFragment extends RestrictedDashboardFragment im
} }
mDevicePreferenceMap.put(cachedDevice, preference); mDevicePreferenceMap.put(cachedDevice, preference);
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Add device. device: " + cachedDevice); Log.d(TAG, "Add device. device: " + cachedDevice.getDevice());
} }
} }
void removeDevice(CachedBluetoothDevice cachedDevice) { void removeDevice(CachedBluetoothDevice cachedDevice) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "removeDevice: " + cachedDevice); Log.d(TAG, "removeDevice: " + cachedDevice.getDevice());
} }
BluetoothDevicePreference preference = mDevicePreferenceMap.remove(cachedDevice); BluetoothDevicePreference preference = mDevicePreferenceMap.remove(cachedDevice);
if (mAvailableHearingDeviceGroup != null && preference != null) { if (mAvailableHearingDeviceGroup != null && preference != null) {
@@ -329,10 +329,15 @@ public class HearingDevicePairingFragment extends RestrictedDashboardFragment im
CachedBluetoothDevice cachedDevice = mCachedDeviceManager.findDevice(device); CachedBluetoothDevice cachedDevice = mCachedDeviceManager.findDevice(device);
if (cachedDevice == null) { if (cachedDevice == null) {
cachedDevice = mCachedDeviceManager.addDevice(device); cachedDevice = mCachedDeviceManager.addDevice(device);
} else if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
if (DEBUG) {
Log.d(TAG, "Skip this device, already bonded: " + cachedDevice.getDevice());
}
return;
} }
if (cachedDevice.getHearingAidInfo() == null) { if (cachedDevice.getHearingAidInfo() == null) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Set hearing aid info on device: " + cachedDevice); Log.d(TAG, "Set hearing aid info on device: " + cachedDevice.getDevice());
} }
cachedDevice.setHearingAidInfo(new HearingAidInfo.Builder().build()); cachedDevice.setHearingAidInfo(new HearingAidInfo.Builder().build());
} }
@@ -450,7 +455,7 @@ public class HearingDevicePairingFragment extends RestrictedDashboardFragment im
void discoverServices(CachedBluetoothDevice cachedDevice) { void discoverServices(CachedBluetoothDevice cachedDevice) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "connectGattToCheckCompatibility, device: " + cachedDevice); Log.d(TAG, "connectGattToCheckCompatibility, device: " + cachedDevice.getDevice());
} }
BluetoothGatt gatt = cachedDevice.getDevice().connectGatt(getContext(), false, BluetoothGatt gatt = cachedDevice.getDevice().connectGatt(getContext(), false,
new BluetoothGattCallback() { new BluetoothGattCallback() {
@@ -460,7 +465,7 @@ public class HearingDevicePairingFragment extends RestrictedDashboardFragment im
super.onConnectionStateChange(gatt, status, newState); super.onConnectionStateChange(gatt, status, newState);
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "onConnectionStateChange, status: " + status + ", newState: " Log.d(TAG, "onConnectionStateChange, status: " + status + ", newState: "
+ newState + ", device: " + cachedDevice); + newState + ", device: " + cachedDevice.getDevice());
} }
if (status == GATT_SUCCESS if (status == GATT_SUCCESS
&& newState == BluetoothProfile.STATE_CONNECTED) { && newState == BluetoothProfile.STATE_CONNECTED) {
@@ -476,13 +481,14 @@ public class HearingDevicePairingFragment extends RestrictedDashboardFragment im
super.onServicesDiscovered(gatt, status); super.onServicesDiscovered(gatt, status);
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "onServicesDiscovered, status: " + status + ", device: " Log.d(TAG, "onServicesDiscovered, status: " + status + ", device: "
+ cachedDevice); + cachedDevice.getDevice());
} }
if (status == GATT_SUCCESS) { if (status == GATT_SUCCESS) {
if (gatt.getService(BluetoothUuid.HEARING_AID.getUuid()) != null if (gatt.getService(BluetoothUuid.HEARING_AID.getUuid()) != null
|| gatt.getService(BluetoothUuid.HAS.getUuid()) != null) { || gatt.getService(BluetoothUuid.HAS.getUuid()) != null) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "compatible with Android, device: " + cachedDevice); Log.d(TAG, "compatible with Android, device: "
+ cachedDevice.getDevice());
} }
addDevice(cachedDevice); addDevice(cachedDevice);
} }