Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14b63747 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Remove unused BT_STACK_TEST_MODULE_ID" am: 7b1f0de4 

am: 1c0e29af

Change-Id: I7df5c5f385ce3a33088ad11996a3715b283359b6
parents 7137076d 1c0e29af

android/app/jni/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ cc_library_shared { 
        "libandroid_runtime",

        "libchrome",

        "libnativehelper",

        "libcutils",

        "libutils",

        "liblog",

        "libhardware",

    ],

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+1 −6
Original line number Diff line number Diff line
@@ -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 @@ static void classInitNative(JNIEnv* env, jclass clazz) { 
  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);