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

Commit 1dca5c06 authored by Rob Seymour's avatar Rob Seymour Committed by Automerger Merge Worker
Browse files

Merge "Add prebuilt_etc module (bt_controller_properties) for controller... 

Merge "Add prebuilt_etc module (bt_controller_properties) for controller properties." am: 435820b3 am: 947c583e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1854234

Change-Id: I2b28765760d2fe114d943ee006fba84ef5436a92
parents ecc6f5e1 947c583e

system/test/rootcanal/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ cc_binary { 
        "packages/modules/Bluetooth/system/stack/include",

    ],

    init_rc: ["android.hardware.bluetooth@1.1-service.sim.rc"],

    required: ["bt_controller_properties"],

}



cc_library_shared {

system/vendor_libs/test_vendor_lib/data/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -12,3 +12,11 @@ prebuilt_etc_host { 
    src: "controller_properties.json",

    sub_dir: "rootcanal/data",

}



prebuilt_etc {

    name: "bt_controller_properties",

    src: "controller_properties.json",

    vendor: true,

    filename_from_src: true,

    sub_dir: "bluetooth",

}

system/vendor_libs/test_vendor_lib/model/controller/dual_mode_controller.h

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ using ::bluetooth::hci::CommandView; 
// "Hci" to distinguish it as a controller command.

class DualModeController : public Device {

  // The location of the config file loaded to populate controller attributes.

  static constexpr char kControllerPropertiesFile[] = "/etc/bluetooth/controller_properties.json";

  static constexpr char kControllerPropertiesFile[] =

      "/vendor/etc/bluetooth/controller_properties.json";

  static constexpr uint16_t kSecurityManagerNumKeys = 15;



 public:

system/vendor_libs/test_vendor_lib/model/devices/device_properties.cc

+2 −2
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ DeviceProperties::DeviceProperties(const std::string& file_name) 


  std::string errs;

  if (!Json::parseFromStream(builder, file, &root, &errs)) {

    LOG_ERROR("Error reading controller properties from file: %s",

              errs.c_str());

    LOG_ERROR("Error reading controller properties from file: %s error: %s",

              file_name.c_str(), errs.c_str());

    return;

  }