commit 26dbb6fb0989d7b13f02e9416286adbb7bc63dd1
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 20 23:16:45 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 20 23:16:45 2017 +0000
tree 2332d20221799825b61bca3ce1dd1c7e9477a13a
parent 05211ae7636857ee795c9dd1ebd028b04274515d
parent 8e2f5ef5b664bf2e8aac92c6a9abc37cd53bd642

Merge "Remove unused BT_STACK_TEST_MODULE_ID"

jni/Android.bp

diff --git a/jni/Android.bp b/jni/Android.bp
index 73700e8..e86b548 100644
--- a/jni/Android.bp
+++ b/jni/Android.bp
@@ -23,8 +23,6 @@
         "libandroid_runtime",
         "libchrome",
         "libnativehelper",
-        "libcutils",
-        "libutils",
         "liblog",
         "libhardware",
     ],

jni/com_android_bluetooth_btservice_AdapterService.cpp

diff --git a/jni/com_android_bluetooth_btservice_AdapterService.cpp b/jni/com_android_bluetooth_btservice_AdapterService.cpp
index 95b04c8..53261a7 100644
--- a/jni/com_android_bluetooth_btservice_AdapterService.cpp
+++ b/jni/com_android_bluetooth_btservice_AdapterService.cpp
@@ -18,7 +18,6 @@
 #include "android_runtime/AndroidRuntime.h"
 #include "android_runtime/Log.h"
 #include "com_android_bluetooth.h"
-#include "cutils/properties.h"
 #include "hardware/bt_sock.h"
 #include "utils/Log.h"
 #include "utils/misc.h"
@@ -622,11 +621,7 @@
   method_energyInfo = env->GetMethodID(
       clazz, "energyInfoCallback", "(IIJJJJ[Landroid/bluetooth/UidTraffic;)V");
 
-  char value[PROPERTY_VALUE_MAX];
-  property_get("bluetooth.mock_stack", value, "");
-
-  const char* id =
-      (strcmp(value, "1") ? BT_STACK_MODULE_ID : BT_STACK_TEST_MODULE_ID);
+  const char* id = BT_STACK_MODULE_ID;
 
   hw_module_t* module;
   int err = hw_get_module(id, (hw_module_t const**)&module);