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

Commit 23887c8e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "NIAP for AOSP" am: f7d026fc 

Change-Id: Ice66e04448dca3896fe8b487cad89b13bc41ac2d
parents 156c362e f7d026fc

system/btif/src/btif_config.cc

+2 −2
Original line number Diff line number Diff line
@@ -514,11 +514,11 @@ bool btif_config_get_bin(const std::string& section, const std::string& key, 


  bool in_encrypt_key_name_list = btif_in_encrypt_key_name_list(key);

  bool is_key_encrypted = *value_str_from_config == ENCRYPTED_STR;

  std::string string;



  if (!value_str_from_config->empty() && in_encrypt_key_name_list &&

      is_key_encrypted) {

    std::string string =

        get_bluetooth_keystore_interface()->get_key(section + "-" + key);

    string = get_bluetooth_keystore_interface()->get_key(section + "-" + key);

    value_str = &string;

  } else {

    value_str = value_str_from_config;