commit 613c29b6cd0656aa21d0991589782a9d88acbb38
author M Safoorah Banu <safoorah@codeaurora.org> Wed May 01 20:08:16 2019 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue May 07 23:45:50 2019 -0700
tree a89a0641527ae6312a531ea9d2198b2554b1fae1
parent 0a237b0cfbcc64439518a311a996d2e1db484ad4

Bluetooth_ext: Fix KW issues in Android Q

Change-Id: I67b033f6035bffec45879e9695d1f00e77f3a456

packages_apps_bluetooth_ext/jni/com_android_bluetooth_btservice_vendor.cpp

diff --git a/packages_apps_bluetooth_ext/jni/com_android_bluetooth_btservice_vendor.cpp b/packages_apps_bluetooth_ext/jni/com_android_bluetooth_btservice_vendor.cpp
index 66b00c8..e4b775d 100644
--- a/packages_apps_bluetooth_ext/jni/com_android_bluetooth_btservice_vendor.cpp
+++ b/packages_apps_bluetooth_ext/jni/com_android_bluetooth_btservice_vendor.cpp
@@ -477,12 +477,13 @@
 
 int load_bt_configstore_lib() {
     const char* sym = BT_CONFIG_STORE_INTERFACE_STRING;
+    const char* err = "error unknown";
 
     bt_configstore_lib_handle = dlopen("libbtconfigstore.so", RTLD_NOW);
     if (!bt_configstore_lib_handle) {
         const char* err_str = dlerror();
         LOG(ERROR) << __func__ << ": failed to load Bt Config store library, error="
-                   << (err_str ? err_str : "error unknown");
+                   << (err_str ? err_str : err);
         goto error;
     }
 

system_bt_ext/btconfigstore/bt_configstore.cc

diff --git a/system_bt_ext/btconfigstore/bt_configstore.cc b/system_bt_ext/btconfigstore/bt_configstore.cc
index d76d05e..4f91bbf 100644
--- a/system_bt_ext/btconfigstore/bt_configstore.cc
+++ b/system_bt_ext/btconfigstore/bt_configstore.cc
@@ -401,7 +401,7 @@
         break;
 
       default:
-        LOG_INFO(LOG_TAG, "%s:: prop type not handled %d", __func__, vProp.type);
+        LOG_INFO(LOG_TAG, "%s:: prop type not handled %d", __func__, vPropType);
         config_free(config);
         return status;
     }