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

Commit 99b1c416 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "RootCanal: Remove unused code"

parents 6c81453f 94593dea

system/test/rootcanal/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ cc_binary { 
        "android.hardware.bluetooth-async",

        "android.hardware.bluetooth-hci",

        "libbt-rootcanal",

        "libbt-rootcanal-types",

        "libscriptedbeaconpayload-protos-lite",

    ],

    include_dirs: [
@@ -111,7 +110,6 @@ cc_library_shared { 
        "android.hardware.bluetooth-async",

        "android.hardware.bluetooth-hci",

        "libbt-rootcanal",

        "libbt-rootcanal-types",

        "libscriptedbeaconpayload-protos-lite",

    ],

    include_dirs: [

system/vendor_libs/test_vendor_lib/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ cc_library_static { 
    ],

    static_libs: [

        "libjsoncpp",

        "libbt-rootcanal-types",

        "libscriptedbeaconpayload-protos-lite",

    ],

}
@@ -127,7 +126,6 @@ cc_test_host { 
        "liblog",

    ],

    static_libs: [

        "libbt-rootcanal-types",

        "libbt-rootcanal",

    ],

    cflags: [
@@ -174,7 +172,6 @@ cc_binary_host { 
    ],

    static_libs: [

        "libjsoncpp",

        "libbt-rootcanal-types",

        "libprotobuf-cpp-lite",

        "libscriptedbeaconpayload-protos-lite",

        "libbt-rootcanal",

system/vendor_libs/test_vendor_lib/include/inquiry.h

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
/*

 * Copyright 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



namespace test_vendor_lib {



class Inquiry {

 public:

  enum class InquiryState : uint8_t {

    STANDBY = 0x00,

    INQUIRY = 0x01,

  };

  enum class InquiryType : uint8_t {

    STANDARD = 0x00,

    RSSI = 0x01,

    EXTENDED = 0x02,

  };

};

}  // namespace test_vendor_lib

system/vendor_libs/test_vendor_lib/include/sco.h

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
/*

 * Copyright 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include <cstdint>



namespace test_vendor_lib {

namespace sco {



// SCO data packets are specified in the Bluetooth Core Specification Version

// 4.2, Volume 2, Part E, Section 5.4.3

enum class PacketStatusFlagsType : uint8_t {

  CORRECTLY_RECEIVED = 0,

  POSSIBLY_INCOMPLETE = 1,

  NO_DATA = 2,

  PARTIALLY_LOST = 3

};

}  // namespace sco

}  // namespace test_vendor_lib

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

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include "hci/address.h"

#include "hci/hci_packets.h"

#include "include/inquiry.h"

#include "include/phy.h"

#include "model/controller/acl_connection_handler.h"

#include "model/controller/le_advertiser.h"