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

Commit 813b64ea authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

Rootcanal: Add SetExtendedProperties am: 9b879c82 

am: 17492f0c

Change-Id: Icf677544274e9a18797e5d52cbc33817aaecf4b8
parents 762089d4 17492f0c

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -674,6 +674,7 @@ void DualModeController::HciWriteLeHostSupport(packets::PacketView<true> args) { 
void DualModeController::HciWriteSecureConnectionHostSupport(

void DualModeController::HciWriteSecureConnectionHostSupport(

    packets::PacketView<true> args) {

    packets::PacketView<true> args) {

  ASSERT_LOG(args.size() == 1, "%s  size=%zu", __func__, args.size());

  ASSERT_LOG(args.size() == 1, "%s  size=%zu", __func__, args.size());

  properties_.SetExtendedFeatures(properties_.GetExtendedFeatures(1) | 0x8, 1);

  SendCommandCompleteSuccess(

  SendCommandCompleteSuccess(

      bluetooth::hci::OpCode::WRITE_SECURE_CONNECTIONS_HOST_SUPPORT);

      bluetooth::hci::OpCode::WRITE_SECURE_CONNECTIONS_HOST_SUPPORT);

}

}

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ CarKit::CarKit() : Device(kCarKitPropertiesFile) { 




  properties_.SetPageScanRepetitionMode(0);

  properties_.SetPageScanRepetitionMode(0);

  properties_.SetClassOfDevice(0x600420);

  properties_.SetClassOfDevice(0x600420);

  properties_.SetSupportedFeatures(0x8779ff9bfe8defff);

  properties_.SetExtendedFeatures(0x8779ff9bfe8defff, 0);

  properties_.SetExtendedInquiryData({

  properties_.SetExtendedInquiryData({

      16,  // length

      16,  // length

      9,   // Type: Device Name

      9,   // Type: Device Name

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ Classic::Classic() { 
                                      'g', 'D', 'e', 'v', 'i', 'c', 'e', '-', 'c', 'l', 'a', 's', 's', 'i', 'c',

                                      'g', 'D', 'e', 'v', 'i', 'c', 'e', '-', 'c', 'l', 'a', 's', 's', 'i', 'c',

                                      '\0'});  // End of data

                                      '\0'});  // End of data

  properties_.SetPageScanRepetitionMode(0);

  properties_.SetPageScanRepetitionMode(0);

  properties_.SetSupportedFeatures(0x87593F9bFE8FFEFF);

  properties_.SetExtendedFeatures(0x87593F9bFE8FFEFF, 0);





  page_scan_delay_ms_ = std::chrono::milliseconds(600);

  page_scan_delay_ms_ = std::chrono::milliseconds(600);

}

}

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -49,8 +49,9 @@ class DeviceProperties { 
    return extended_features_[0];

    return extended_features_[0];

  }

  }





  void SetSupportedFeatures(uint64_t features) {

  void SetExtendedFeatures(uint64_t features, uint8_t page_number) {

    extended_features_[0] = features;

    ASSERT(page_number < extended_features_.size());

    extended_features_[page_number] = features;

  }

  }





  // Specification Version 4.2, Volume 2, Part E, Section 7.4.4

  // Specification Version 4.2, Volume 2, Part E, Section 7.4.4
@@ -311,7 +312,7 @@ class DeviceProperties { 
  std::vector<uint8_t> supported_codecs_;

  std::vector<uint8_t> supported_codecs_;

  std::vector<uint32_t> vendor_specific_codecs_;

  std::vector<uint32_t> vendor_specific_codecs_;

  std::vector<uint8_t> supported_commands_;

  std::vector<uint8_t> supported_commands_;

  std::vector<uint64_t> extended_features_{{0x875b3fd8fe8ffeff, 0x07}};

  std::vector<uint64_t> extended_features_{{0x875b3fd8fe8ffeff, 0x0f}};

  ClassOfDevice class_of_device_{{0, 0, 0}};

  ClassOfDevice class_of_device_{{0, 0, 0}};

  std::vector<uint8_t> extended_inquiry_data_;

  std::vector<uint8_t> extended_inquiry_data_;

  std::vector<uint8_t> name_;

  std::vector<uint8_t> name_;