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

Merge "New hearing device pairing page: check gatt status" into main

Browse Source
This commit is contained in:
Angela Wang
2024-02-07 12:31:37 +00:00
committed by Android (Google) Code Review
parent 67484c2791 3ca9ef8edc
commit c9875fc836
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
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,24 +462,33 @@ 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 (isCompatible) { if (status == GATT_SUCCESS) {
addDevice(cachedDevice); if (gatt.getService(BluetoothUuid.HEARING_AID.getUuid()) != null
|| gatt.getService(BluetoothUuid.HAS.getUuid()) != null) {
if (DEBUG) {
Log.d(TAG, "compatible with Android, device: " + cachedDevice);
}
addDevice(cachedDevice);
}
} else {
gatt.disconnect();
mConnectingGattList.remove(gatt);
} }
} }
}); });