Increase the timeout for Hearing Aids Pairing
Some device will need a longer time to do its service discovery process
and therefore, need a longer timeout. This is especially true for the
second device where the connection interval is increased.
Bug: 131835452
Test: Manual
Change-Id: I2e0821e30a0f08a4a123b8b5447a8b44c8830f9a
Merged-In: I2e0821e30a0f08a4a123b8b5447a8b44c8830f9a
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
index cba823c..9e016c2 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
@@ -120,6 +120,8 @@
// See mConnectAttempted
private static final long MAX_UUID_DELAY_FOR_AUTO_CONNECT = 5000;
+ // Some Hearing Aids (especially the 2nd device) needs more time to do service discovery
+ private static final long MAX_HEARING_AIDS_DELAY_FOR_AUTO_CONNECT = 15000;
private static final long MAX_HOGP_DELAY_FOR_AUTO_CONNECT = 30000;
// Active device state
@@ -245,7 +247,7 @@
// various profiles
// If UUIDs are not available yet, connect will be happen
// upon arrival of the ACTION_UUID intent.
- Log.d(TAG, "No profiles. Maybe we will connect later");
+ Log.d(TAG, "No profiles. Maybe we will connect later for device " + mDevice);
return;
}
@@ -681,10 +683,12 @@
long timeout = MAX_UUID_DELAY_FOR_AUTO_CONNECT;
if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Hogp)) {
timeout = MAX_HOGP_DELAY_FOR_AUTO_CONNECT;
+ } else if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.HearingAid)) {
+ timeout = MAX_HEARING_AIDS_DELAY_FOR_AUTO_CONNECT;
}
if (DEBUG) {
- Log.d(TAG, "onUuidChanged: Time since last connect"
+ Log.d(TAG, "onUuidChanged: Time since last connect="
+ (SystemClock.elapsedRealtime() - mConnectAttempted));
}