diff options
| author | Jakub Tyszkowski <jakub.tyszkowski@tieto.com> | 2014-08-04 12:53:33 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-08-04 14:32:29 +0300 |
| commit | 744af896a8a3d3063eb1c73d61b073ec4447743a (patch) | |
| tree | 32a21fbdfc4ddbe281f5d1d30f729c92d76840ed /android/bluetooth.c | |
| parent | c8a9069f95dfb7cc183db0ce2069a5ecc8d3d020 (diff) | |
| download | bluez-744af896a8a3d3063eb1c73d61b073ec4447743a.tar.gz | |
android/bluetooth: Fix retriggering the discovery
Previously le device found callback was set every time we triggered the scan
from gatt. But it does no longer work like that. This callback is now set
when gatt profile is registered and should not be used for checking if we
should be retriggering the scan. Expected discovery flag should be
used directly instead.
Diffstat (limited to 'android/bluetooth.c')
| -rw-r--r-- | android/bluetooth.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/android/bluetooth.c b/android/bluetooth.c index 38ee9a92d..655844de2 100644 --- a/android/bluetooth.c +++ b/android/bluetooth.c @@ -3815,9 +3815,16 @@ bool bt_le_discovery_start(void) adapter.le_scanning = true; - /* If core is discovering, don't bother */ - if (adapter.cur_discovery_type != SCAN_TYPE_NONE) + /* + * If core is discovering - just set expected next scan type. + * It will be triggered in case current scan session is almost done + * i.e. we missed LE phase in interleaved scan, or we're trying to + * connect to device that was already discovered. + */ + if (adapter.cur_discovery_type != SCAN_TYPE_NONE) { + adapter.exp_discovery_type = SCAN_TYPE_LE; return true; + } if (start_discovery(SCAN_TYPE_LE)) return true; @@ -4804,7 +4811,7 @@ static void handle_cancel_discovery_cmd(const void *buf, uint16_t len) if (get_supported_discovery_type() != SCAN_TYPE_LE) break; - if (gatt_device_found_cb) { + if (adapter.exp_discovery_type == SCAN_TYPE_LE) { status = HAL_STATUS_BUSY; goto failed; } @@ -4822,8 +4829,9 @@ static void handle_cancel_discovery_cmd(const void *buf, uint16_t len) goto failed; } - adapter.exp_discovery_type = gatt_device_found_cb ? - SCAN_TYPE_LE : SCAN_TYPE_NONE; + if (adapter.exp_discovery_type != SCAN_TYPE_LE) + adapter.exp_discovery_type = SCAN_TYPE_NONE; + break; } |