summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-01-10 01:28:52 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-01-10 01:28:52 -0800
commitb021c9ba81f3d9587d8182fc3c6f6c99c9965592 (patch)
treee6226dfad9cd0fb29cc5f5f4b3110e816da850dd
parentf8b549223b709965d3b7d4452e67505b4974139f (diff)
parent960ddcb8f8529c12d01ab52c5138f95fc1bc26c1 (diff)
downloadandroid_hardware_qcom_bt-b021c9ba81f3d9587d8182fc3c6f6c99c9965592.tar.gz
android_hardware_qcom_bt-b021c9ba81f3d9587d8182fc3c6f6c99c9965592.tar.bz2
android_hardware_qcom_bt-b021c9ba81f3d9587d8182fc3c6f6c99c9965592.zip
Merge "Read BD address from persist file"
-rw-r--r--libbt-vendor/src/bt_vendor_qcom.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libbt-vendor/src/bt_vendor_qcom.c b/libbt-vendor/src/bt_vendor_qcom.c
index 71c96c4..6ac4abb 100644
--- a/libbt-vendor/src/bt_vendor_qcom.c
+++ b/libbt-vendor/src/bt_vendor_qcom.c
@@ -491,6 +491,12 @@ static int op(bt_vendor_opcode_t opcode, void *param)
} else {
ALOGV("rome_soc_init is started");
property_set("wc_transport.soc_initialized", "0");
+ /* Always read BD address from NV file */
+ if(!bt_vendor_nv_read(1, vnd_local_bd_addr))
+ {
+ /* Since the BD address is configured in boot time We should not be here */
+ ALOGI("Failed to read BD address. Use the one from bluedroid stack/ftm");
+ }
if(rome_soc_init(fd,vnd_local_bd_addr)<0) {
retval = -1;
} else {