summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKausik Sinnaswamy <kausik@broadcom.com>2012-03-07 11:05:55 -0800
committerMatthew Xie <mattx@google.com>2012-07-14 11:19:12 -0700
commit1fccc6fb010a00034b8328db51801686341b121e (patch)
tree55a3a8318fd6816d84e06d12df61a4a31ffe1d03
parent002a3f1c18f0caf9994f55779fc4071c274b5793 (diff)
downloadexternal_bluetooth_bluedroid-1fccc6fb010a00034b8328db51801686341b121e.zip
external_bluetooth_bluedroid-1fccc6fb010a00034b8328db51801686341b121e.tar.gz
external_bluetooth_bluedroid-1fccc6fb010a00034b8328db51801686341b121e.tar.bz2
During stack enable, always set the adapter to SCAN_MODE_NONE
irrespective of what the NVRAM reports. Change-Id: I3320ee4af11e834522a18ffb79a15f6cdd0d69d2
-rw-r--r--btif/src/btif_storage.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/btif/src/btif_storage.c b/btif/src/btif_storage.c
index 6c0c337..4905931 100644
--- a/btif/src/btif_storage.c
+++ b/btif/src/btif_storage.c
@@ -969,8 +969,14 @@ bt_status_t btif_storage_load_bonded_devices(void)
num_props++;
/* SCAN_MODE */
- BTIF_STORAGE_GET_ADAPTER_PROP(BT_PROPERTY_ADAPTER_SCAN_MODE, &mode, sizeof(mode),
- adapter_props[num_props]);
+ /* TODO: At the time of BT on, always report the scan mode as 0 irrespective
+ of the scan_mode during the previous enable cycle.
+ This needs to be re-visited as part of the app/stack enable sequence
+ synchronization */
+ mode = BT_SCAN_MODE_NONE;
+ adapter_props[num_props].type = BT_PROPERTY_ADAPTER_SCAN_MODE;
+ adapter_props[num_props].len = sizeof(mode);
+ adapter_props[num_props].val = &mode;
num_props++;
/* DISC_TIMEOUT */