summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jakub Pawlowski <jpawlowski@google.com> 2021-10-11 19:46:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-11 19:46:06 +0000
commit929d2e04ee59ea578ad214c6362808662d9906c0 (patch)
tree319b5d9ff195da36c5bb90d89631ab68643512c9
parent58ae8524f586ef9d504791d28b979a2857c71e9c (diff)
parenta457cb6f908881924b992a2b55a3f6233c858cf3 (diff)
Merge "bluetooth: Set special delay for LeAudio auto connect" am: a457cb6f90
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1830517 Change-Id: Ie7b274afcae17c39de6e2cbd19f881dc7803d28d
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
index 7ce9b516990e..243194188727 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
@@ -69,6 +69,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
// 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;
+ private static final long MAX_LEAUDIO_DELAY_FOR_AUTO_CONNECT = 30000;
private static final long MAX_MEDIA_PROFILE_CONNECT_DELAY = 60000;
private final Context mContext;
@@ -757,6 +758,8 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
timeout = MAX_HOGP_DELAY_FOR_AUTO_CONNECT;
} else if (ArrayUtils.contains(uuids, BluetoothUuid.HEARING_AID)) {
timeout = MAX_HEARING_AIDS_DELAY_FOR_AUTO_CONNECT;
+ } else if (ArrayUtils.contains(uuids, BluetoothUuid.LE_AUDIO)) {
+ timeout = MAX_LEAUDIO_DELAY_FOR_AUTO_CONNECT;
}
if (BluetoothUtils.D) {