commit f341b03bfa75bdc12a155f595c2939a1d6290961
author Balakrishna Godavarthi <bgodavar@codeaurora.org> Fri Jan 24 15:44:37 2020 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Feb 06 02:41:29 2020 -0800
tree a27902f3e8329482c6112767c436cb5c0463191a
parent 2fa2013f4d1b43c56ea0bcc59814173331c10f42

BTCONFIGSTORE: Use flushCommands() before btconfigstore close

To align with respective LAZY HAL, use flushCommands() after
calling IBTConfigStore close. This will ensure to decrement
the HIDL usage counter by one.

Change-Id: Ibfe84babe00bef32232cd8a3e49c8c97a40e912e

system_bt_ext/btconfigstore/Android.bp

diff --git a/system_bt_ext/btconfigstore/Android.bp b/system_bt_ext/btconfigstore/Android.bp
index 2c82531..888921c 100644
--- a/system_bt_ext/btconfigstore/Android.bp
+++ b/system_bt_ext/btconfigstore/Android.bp
@@ -33,4 +33,12 @@
     required: [
         "bt_configstore.conf",
     ],
+
+    arch: {
+        arm: {
+            cflags: [
+                "-DARCH_ARM_32"
+            ],
+        },
+    },
 }

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 0e05453..9d0b51d 100644
--- a/system_bt_ext/btconfigstore/bt_configstore.cc
+++ b/system_bt_ext/btconfigstore/bt_configstore.cc
@@ -82,8 +82,6 @@
 static bt_soc_type_t convertSocNameToBTSocType(const char * name);
 static const char * convertPropTypeToStringFormat(uint32_t propType);
 
-const bool IsLazyHalSupported(property_get_bool("ro.vendor.bt.enablelazyhal", false));
-
 EXPORT_SYMBOL bt_configstore_interface_t btConfigStoreInterface = {
     sizeof(btConfigStoreInterface),
     getVendorProperties,
@@ -93,6 +91,37 @@
     convertPropTypeToStringFormat,
 };
 
+#ifdef ARCH_ARM_32
+bool IsLazyHalSupported()
+{
+  static bool isPropertyRead = false;
+  static bool isLazyHalEnabled = false;
+
+  /* MSM8937 target supports both lazy and non lazy hal
+   * which is differentiated by a property.
+   * isLazyHalPropStatus holds the property status.
+   */
+  ALOGD("%s isPropertyRead: %d isLazyHalEnabled: %d", __func__, isPropertyRead,
+         isLazyHalEnabled);
+
+  if (!isPropertyRead) {
+    char device[PROPERTY_VALUE_MAX]= {'\0'};
+    int len = property_get("ro.board.platform", device, "");
+    if (len) {
+      isPropertyRead = true;
+      isLazyHalEnabled = (!strcmp(device, "bengal") ? true : false);
+      if (!isLazyHalEnabled && !strcmp(device, "msm8937")) {
+        isLazyHalEnabled = property_get_bool("ro.vendor.bt.enablelazyhal", false);
+      }
+      ALOGD("%s isLazyHalEnabled: %d", __func__, isLazyHalEnabled);
+    } else {
+      ALOGE("%s: Failed to read property", __func__);
+    }
+  }
+
+  return isLazyHalEnabled;
+}
+#endif
 
 /*******************************************************************************
 **
@@ -150,8 +179,12 @@
     }
   }
 
-  if (IsLazyHalSupported && btConfigStore != nullptr)
+#ifdef ARCH_ARM_32
+  if (btConfigStore != nullptr && IsLazyHalSupported()) {
+    LOG_DEBUG(LOG_TAG, "%s: decrementing HIDL usage counter", __func__);
     IPCThreadState::self()->flushCommands();
+  }
+#endif
 
   btConfigStore = nullptr;
   return status;
@@ -193,8 +226,12 @@
     LOG_WARN(LOG_TAG, "%s btConfigStore is null", __func__);
   }
 
-  if (IsLazyHalSupported && btConfigStore != nullptr)
+#ifdef ARCH_ARM_32
+  if (btConfigStore != nullptr && IsLazyHalSupported()) {
+    LOG_DEBUG(LOG_TAG, "%s: decrementing HIDL usage counter", __func__);
     IPCThreadState::self()->flushCommands();
+  }
+#endif
 
   btConfigStore = nullptr;
   return status;
@@ -259,8 +296,12 @@
     LOG_WARN(LOG_TAG, "%s add feature is not avaliable", __func__);
   }
 
-  if (IsLazyHalSupported && btConfigStore != nullptr)
+#ifdef ARCH_ARM_32
+  if (btConfigStore != nullptr && IsLazyHalSupported()) {
+    LOG_DEBUG(LOG_TAG, "%s: decrementing HIDL usage counter", __func__);
     IPCThreadState::self()->flushCommands();
+  }
+#endif
 
   btConfigStore = nullptr;
   return status;