2013-10-31 11:52:38

by Andrei Emeltchenko

Subject: [PATCH] android/daemon: Fix error setting property

From: Andrei Emeltchenko <[email protected]>

Do not return error setting property which is already set. This fixes
bug with set_scan_mode which might return HAL_STATUS_DONE.
---
android/adapter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/adapter.c b/android/adapter.c
index 98b2764..9d4da4e 100644
--- a/android/adapter.c
+++ b/android/adapter.c
@@ -917,7 +917,7 @@ void bt_adapter_handle_cmd(GIOChannel *io, uint8_t opcode, void *buf,
break;
case HAL_OP_SET_ADAPTER_PROP:
status = set_property(buf, len);
- if (status != HAL_STATUS_SUCCESS)
+ if (status != HAL_STATUS_SUCCESS && status != HAL_STATUS_DONE)
goto error;

break;
--
1.7.10.4

2013-10-31 13:45:16

by Johan Hedberg

Subject: Re: [PATCH] android/daemon: Fix error setting property

Hi Andrei,

On Thu, Oct 31, 2013, Andrei Emeltchenko wrote:
> Do not return error setting property which is already set. This fixes
> bug with set_scan_mode which might return HAL_STATUS_DONE.
> ---
> android/adapter.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Applied. Thanks.

Johan