diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:26:57 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:37:50 -0700 |
| commit | ccde045431d38d4828412149f067631487f8025f (patch) | |
| tree | e54c3e18a449d800f32a0cb493e6180dc66235d1 /hci/src/hci_layer.c | |
| parent | 95b17c4c4309cfee7fc0fc180dc9133195579c8b (diff) | |
| parent | 472271b153c5dc53c28beac55480a8d8434b2d5c (diff) | |
| download | android_system_bt-ccde045431d38d4828412149f067631487f8025f.tar.gz android_system_bt-ccde045431d38d4828412149f067631487f8025f.tar.bz2 android_system_bt-ccde045431d38d4828412149f067631487f8025f.zip | |
Merge tag 'android-6.0.1_r61' into HEADreplicant-6.0-0001stable/cm-13.0-ZNH5Y
Android 6.0.1 Release 61 (MOB30Z)
Change-Id: Icda48d6c36e74365e608d80f0054fc58d8febc26
Diffstat (limited to 'hci/src/hci_layer.c')
| -rw-r--r-- | hci/src/hci_layer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hci/src/hci_layer.c b/hci/src/hci_layer.c index a6c9a93f7..ed1c7eec3 100644 --- a/hci/src/hci_layer.c +++ b/hci/src/hci_layer.c @@ -20,6 +20,7 @@ #include <assert.h> #include <cutils/properties.h> +#include <errno.h> #include <string.h> #include <signal.h> #include <string.h> @@ -531,7 +532,7 @@ static void command_timed_out(UNUSED_ATTR void *context) { LOG_ERROR("%s restarting the bluetooth process.", __func__); ssr_cleanup(0x22);//SSR reasno 0x22 = CMD TO - usleep(20000); + TEMP_FAILURE_RETRY(usleep(20000)); //Reset SOC status to trigger hciattach service if (property_set("bluetooth.status", "off") < 0) { LOG_ERROR("hci_cmd_timeout: Error resetting SOC status\n "); |