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

Commit fedcfcda authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge changes Ief56997a,I5c1bceb7 into main am: 23951436 am: dab5b3ff am:... 

Merge changes Ief56997a,I5c1bceb7 into main am: 23951436 am: dab5b3ff am: 86cf2b82 am: d19a7222

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



Change-Id: I823034f1f143d5e1c1ff33084f68a00ee4ddd238
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0bc819f2 d19a7222

system/btif/include/btif_config.h

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ bool btif_config_set_bin(const std::string& section, const std::string& key, 
                         const uint8_t* value, size_t length);

bool btif_config_remove(const std::string& section, const std::string& key);



void btif_config_remove_device(const std::string& section);



size_t btif_config_get_bin_length(const std::string& section,

                                  const std::string& key);

system/btif/src/btif_config.cc

+5 −0
Original line number Diff line number Diff line
@@ -337,6 +337,11 @@ bool btif_config_remove(const std::string& section, const std::string& key) { 
  return bluetooth::shim::BtifConfigInterface::RemoveProperty(section, key);

}



void btif_config_remove_device(const std::string& section) {

  CHECK(bluetooth::shim::is_gd_stack_started_up());

  bluetooth::shim::BtifConfigInterface::RemoveSection(section);

}



bool btif_config_clear(void) {

  CHECK(bluetooth::shim::is_gd_stack_started_up());

  bluetooth::shim::BtifConfigInterface::Clear();

system/btif/src/btif_storage.cc

+201 −260

File changed.

Preview size limit exceeded, changes collapsed.

system/main/shim/config.cc

+4 −0
Original line number Diff line number Diff line
@@ -143,6 +143,10 @@ bool BtifConfigInterface::RemoveProperty(const std::string& section, 
  return GetStorage()->RemoveProperty(section, property);

}



void BtifConfigInterface::RemoveSection(const std::string& section) {

  GetStorage()->RemoveSection(section);

}



std::vector<std::string> BtifConfigInterface::GetPersistentDevices() {

  return GetStorage()->GetPersistentSections();

}

system/main/shim/config.h

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ class BtifConfigInterface { 
                     const uint8_t* value, size_t length);

  static bool RemoveProperty(const std::string& section,

                             const std::string& key);

  static void RemoveSection(const std::string& section);

  static std::vector<std::string> GetPersistentDevices();

  static void ConvertEncryptOrDecryptKeyIfNeeded();

  static void Clear();