HCI: Remove deprecated TRACK command

Bug: 175422340
Test: cert/run
Tag: #gd-refactor
Change-Id: I813f1737a5794ccf548bdf3e537d2b32f445d107

diff --git a/gd/hci/controller.cc b/gd/hci/controller.cc
index f13d255..e4420ed 100644 (file)
--- a/gd/hci/controller.cc
+++ b/gd/hci/controller.cc
@@ -777,8 +777,6 @@ struct Controller::impl {
         return vendor_capabilities_.total_scan_results_storage_ != 0x00;
       case OpCode::LE_ADV_FILTER:
         return vendor_capabilities_.filtering_support_ == 0x01;
-      case OpCode::LE_TRACK_ADV:
-        return vendor_capabilities_.total_num_of_advt_tracked_ > 0;
       case OpCode::LE_ENERGY_INFO:
         return vendor_capabilities_.activity_energy_info_support_ == 0x01;
       case OpCode::LE_EXTENDED_SCAN_PARAMS:

diff --git a/gd/hci/controller_test.cc b/gd/hci/controller_test.cc
index dcbafe4..c4da73c 100644 (file)
--- a/gd/hci/controller_test.cc
+++ b/gd/hci/controller_test.cc
@@ -394,7 +394,6 @@ TEST_F(ControllerTest, is_supported_test) {
 TEST_F(ControllerTest, feature_spec_version_055_test) {
   EXPECT_EQ(controller_->GetVendorCapabilities().version_supported_, 55);
   EXPECT_TRUE(controller_->IsSupported(OpCode::LE_MULTI_ADVT));
-  EXPECT_FALSE(controller_->IsSupported(OpCode::LE_TRACK_ADV));
   EXPECT_FALSE(controller_->IsSupported(OpCode::CONTROLLER_DEBUG_INFO));
   EXPECT_FALSE(controller_->IsSupported(OpCode::CONTROLLER_A2DP_OPCODE));
   feature_spec_version = 95;
@@ -403,7 +402,6 @@ TEST_F(ControllerTest, feature_spec_version_055_test) {
 TEST_F(ControllerTest, feature_spec_version_095_test) {
   EXPECT_EQ(controller_->GetVendorCapabilities().version_supported_, 95);
   EXPECT_TRUE(controller_->IsSupported(OpCode::LE_MULTI_ADVT));
-  EXPECT_TRUE(controller_->IsSupported(OpCode::LE_TRACK_ADV));
   EXPECT_FALSE(controller_->IsSupported(OpCode::CONTROLLER_DEBUG_INFO));
   EXPECT_FALSE(controller_->IsSupported(OpCode::CONTROLLER_A2DP_OPCODE));
   feature_spec_version = 96;
@@ -412,7 +410,6 @@ TEST_F(ControllerTest, feature_spec_version_095_test) {
 TEST_F(ControllerTest, feature_spec_version_096_test) {
   EXPECT_EQ(controller_->GetVendorCapabilities().version_supported_, 96);
   EXPECT_TRUE(controller_->IsSupported(OpCode::LE_MULTI_ADVT));
-  EXPECT_TRUE(controller_->IsSupported(OpCode::LE_TRACK_ADV));
   EXPECT_FALSE(controller_->IsSupported(OpCode::CONTROLLER_DEBUG_INFO));
   EXPECT_FALSE(controller_->IsSupported(OpCode::CONTROLLER_A2DP_OPCODE));
   feature_spec_version = 98;
@@ -421,7 +418,6 @@ TEST_F(ControllerTest, feature_spec_version_096_test) {
 TEST_F(ControllerTest, feature_spec_version_098_test) {
   EXPECT_EQ(controller_->GetVendorCapabilities().version_supported_, 98);
   EXPECT_TRUE(controller_->IsSupported(OpCode::LE_MULTI_ADVT));
-  EXPECT_TRUE(controller_->IsSupported(OpCode::LE_TRACK_ADV));
   EXPECT_FALSE(controller_->IsSupported(OpCode::CONTROLLER_DEBUG_INFO));
   EXPECT_TRUE(controller_->IsSupported(OpCode::CONTROLLER_A2DP_OPCODE));
 }

diff --git a/gd/hci/hci_packets.pdl b/gd/hci/hci_packets.pdl
index 40448ab..60a0489 100644 (file)
--- a/gd/hci/hci_packets.pdl
+++ b/gd/hci/hci_packets.pdl
@@ -350,7 +350,6 @@ enum OpCode : 16 {
   LE_MULTI_ADVT = 0xFD54,
   LE_BATCH_SCAN = 0xFD56,
   LE_ADV_FILTER = 0xFD57,
-  LE_TRACK_ADV = 0xFD58,
   LE_ENERGY_INFO = 0xFD59,
   LE_EXTENDED_SCAN_PARAMS = 0xFD5A,
   CONTROLLER_DEBUG_INFO = 0xFD5B,
@@ -4144,10 +4143,6 @@ packet LeAdvFilterServiceDataComplete : LeAdvFilterComplete (apcf_opcode = SERVI
 }
 
 
-packet LeTrackAdv : VendorCommand (op_code = LE_TRACK_ADV) {
-  _payload_,  // placeholder (unimplemented)
-}
-
 packet LeEnergyInfo : VendorCommand (op_code = LE_ENERGY_INFO) {
   _payload_,  // placeholder (unimplemented)
 }

diff --git a/stack/include/hcidefs.h b/stack/include/hcidefs.h
index 3cbb599..c50dfb1 100644 (file)
--- a/stack/include/hcidefs.h
+++ b/stack/include/hcidefs.h
@@ -438,9 +438,6 @@
 /* ADV filter opcode */
 #define HCI_BLE_ADV_FILTER (0x0157 | HCI_GRP_VENDOR_SPECIFIC)
 
-/* Tracking opcode */
-#define HCI_BLE_TRACK_ADV (0x0158 | HCI_GRP_VENDOR_SPECIFIC)
-
 /* Energy info opcode */
 #define HCI_BLE_ENERGY_INFO (0x0159 | HCI_GRP_VENDOR_SPECIFIC)