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

New hearing device pairing page: check gatt status

Browse Source 
Checks the gatt status in `onConnectionStateChange()` and `onServiceDiscovered()` callbacks. Disconnects and removes the gatt from the `mConnectingGattList` if the gatt status is not success in these callbacks.

Bug: 307890347
Test: manual test
Change-Id: Iab09f13b2ff3d33e5c4d6a8710736307c26b17e7
This commit is contained in:
Angela Wang
2024-01-18 06:56:36 +00:00
parent 6368895adf
commit 3ca9ef8edc
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import static android.app.Activity.RESULT_OK; import static android.app.Activity.RESULT_OK;
import static android.bluetooth.BluetoothGatt.GATT_SUCCESS;
import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
@@ -461,25 +462,34 @@ public class HearingDevicePairingFragment extends RestrictedDashboardFragment im
Log.d(TAG, "onConnectionStateChange, status: " + status + ", newState: " Log.d(TAG, "onConnectionStateChange, status: " + status + ", newState: "
+ newState + ", device: " + cachedDevice); + newState + ", device: " + cachedDevice);
} }
if (newState == BluetoothProfile.STATE_CONNECTED) { if (status == GATT_SUCCESS
&& newState == BluetoothProfile.STATE_CONNECTED) {
gatt.discoverServices(); gatt.discoverServices();
} else {
gatt.disconnect();
mConnectingGattList.remove(gatt);
} }
} }
@Override @Override
public void onServicesDiscovered(BluetoothGatt gatt, int status) { public void onServicesDiscovered(BluetoothGatt gatt, int status) {
super.onServicesDiscovered(gatt, status); super.onServicesDiscovered(gatt, status);
boolean isCompatible = gatt.getService(BluetoothUuid.HEARING_AID.getUuid())
!= null
|| gatt.getService(BluetoothUuid.HAS.getUuid()) != null;
if (DEBUG) { if (DEBUG) {
Log.d(TAG, Log.d(TAG, "onServicesDiscovered, status: " + status + ", device: "
"onServicesDiscovered, compatible with Android: " + isCompatible + cachedDevice);
+ ", device: " + cachedDevice); }
if (status == GATT_SUCCESS) {
if (gatt.getService(BluetoothUuid.HEARING_AID.getUuid()) != null
|| gatt.getService(BluetoothUuid.HAS.getUuid()) != null) {
if (DEBUG) {
Log.d(TAG, "compatible with Android, device: " + cachedDevice);
} }
if (isCompatible) {
addDevice(cachedDevice); addDevice(cachedDevice);
} }
} else {
gatt.disconnect();
mConnectingGattList.remove(gatt);
}
} }
}); });
mConnectingGattList.add(gatt); mConnectingGattList.add(gatt);