diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-04 07:10:46 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-04 07:10:46 +0000 |
| commit | 32d1abf3e1caffdc6251f96ae7f67c09115d9a68 (patch) | |
| tree | 73aa33b3d19debfd497dc91367cbbe9907d45cdb | |
| parent | 9a6c49ce2de0b45914380d48282c703f20417ffe (diff) | |
| parent | 1dc69f4180416172a3775276772a71b314285c06 (diff) | |
| download | android_system_bt-32d1abf3e1caffdc6251f96ae7f67c09115d9a68.tar.gz android_system_bt-32d1abf3e1caffdc6251f96ae7f67c09115d9a68.tar.bz2 android_system_bt-32d1abf3e1caffdc6251f96ae7f67c09115d9a68.zip | |
release-request-c1d158b7-bec8-489c-b291-f2070225a3d9-for-git_oc-dr1-release-4245011 snap-temp-L08000000089163353
Change-Id: I7d27bef1fadd9c1386ef3dde271de2249c8d842d
| -rw-r--r-- | device/include/interop_database.h | 1 | ||||
| -rw-r--r-- | hci/src/hci_layer.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/device/include/interop_database.h b/device/include/interop_database.h index 56e56261d..7f4f22958 100644 --- a/device/include/interop_database.h +++ b/device/include/interop_database.h @@ -78,6 +78,7 @@ static const interop_addr_entry_t interop_addr_database[] = { // Uconnect {{{0x00, 0x54, 0xaf, 0, 0, 0}}, 3, INTEROP_2MBPS_LINK_ONLY}, + {{{0x30, 0x14, 0x4a, 0, 0, 0}}, 3, INTEROP_2MBPS_LINK_ONLY}, // LG Tone HBS-730 - unacceptably loud volume {{{0x00, 0x18, 0x6b, 0, 0, 0}}, 3, INTEROP_DISABLE_ABSOLUTE_VOLUME}, diff --git a/hci/src/hci_layer.cc b/hci/src/hci_layer.cc index d1fa92031..563379f0d 100644 --- a/hci/src/hci_layer.cc +++ b/hci/src/hci_layer.cc @@ -78,7 +78,7 @@ static const int BT_HCI_RT_PRIORITY = 1; // Abort if there is no response to an HCI command. static const uint32_t COMMAND_PENDING_TIMEOUT_MS = 2000; -static const uint32_t COMMAND_TIMEOUT_RESTART_US = 5000000; +static const uint32_t COMMAND_TIMEOUT_RESTART_US = 500000; // Our interface static bool interface_created; |