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

Commit 9e5b1044 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RootCanal: Remove default controller-properties.json file" am:... 

Merge "RootCanal: Remove default controller-properties.json file" am: 082ba5e0 am: 4c40479b am: 6d5b0e62

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2276026



Change-Id: Ib8d3d49ba445431761ac33f812209595d9957143
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2f4714ec 6d5b0e62

system/test/rootcanal/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ 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 {

tools/rootcanal/data/Android.bp

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "system_bt_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["system_bt_license"],

}



prebuilt_etc_host {

    name: "controller_properties.json",

    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",

}

tools/rootcanal/data/controller_properties.json

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
{

  "AclDataPacketSize": "1024",

  "EncryptionKeySize": "16",

  "ScoDataPacketSize": "255",

  "NumAclDataPackets": "10",

  "NumScoDataPackets": "10",

  "Version": "12",

  "Revision": "0",

  "LmpPalVersion": "12",

  "ManufacturerName": "0",

  "LmpPalSubversion": "0"

}

tools/rootcanal/model/controller/dual_mode_controller.cc

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ using gd_hci::OpCode; 
using std::vector;



namespace rootcanal {

constexpr char DualModeController::kControllerPropertiesFile[];

constexpr uint16_t DualModeController::kSecurityManagerNumKeys;

constexpr uint16_t kNumCommandPackets = 0x01;

constexpr uint16_t kLeMaximumAdvertisingDataLength = 256;

tools/rootcanal/model/controller/dual_mode_controller.h

+1 −5
Original line number Diff line number Diff line
@@ -51,15 +51,11 @@ using ::bluetooth::hci::CommandView; 
// corresponding Bluetooth command in the Core Specification with the prefix

// "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[] =

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

  static constexpr uint16_t kSecurityManagerNumKeys = 15;



 public:

  // Sets all of the methods to be used as callbacks in the HciHandler.

  DualModeController(const std::string& properties_filename =

                         std::string(kControllerPropertiesFile),

  DualModeController(const std::string& properties_filename = "",

                     uint16_t num_keys = kSecurityManagerNumKeys);



  ~DualModeController() = default;