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

Commit ebb6f616 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [9537713, 9537701, 9537702, 9537538, 9537180, 9537181,... 

Merge cherrypicks of [9537713, 9537701, 9537702, 9537538, 9537180, 9537181, 9537182, 9537183, 9537764, 9537703, 9537784, 9537785, 9537714, 9537715, 9537716, 9537717, 9537786, 9537718, 9537719, 9537720, 9537721, 9537722, 9537787, 9537788, 9537723, 9537804, 9537805, 9537789] into qt-qpr1-release

Change-Id: Idd97306f2cdd4741b468ceee9007c6459e06062e
parents 89f9175f dddf7e55

system/bta/av/bta_av_aact.cc

+5 −5
Original line number Diff line number Diff line
@@ -3056,14 +3056,14 @@ void bta_av_open_at_inc(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
}



void offload_vendor_callback(tBTM_VSC_CMPL* param) {

  uint8_t status = 0;

  tBTA_AV value{0};

  uint8_t sub_opcode = 0;

  if (param->param_len) {

    APPL_TRACE_DEBUG("%s: param_len = %d status = %d", __func__,

                     param->param_len, param->p_param_buf[0]);

    status = param->p_param_buf[0];

    value.status = param->p_param_buf[0];

  }

  if (status == 0) {

  if (value.status == 0) {

    sub_opcode = param->p_param_buf[1];

    APPL_TRACE_DEBUG("%s: subopcode = %d", __func__, sub_opcode);

    switch (sub_opcode) {
@@ -3071,7 +3071,7 @@ void offload_vendor_callback(tBTM_VSC_CMPL* param) { 
        APPL_TRACE_DEBUG("%s: VS_HCI_STOP_A2DP_MEDIA successful", __func__);

        break;

      case VS_HCI_A2DP_OFFLOAD_START:

        (*bta_av_cb.p_cback)(BTA_AV_OFFLOAD_START_RSP_EVT, (tBTA_AV*)&status);

        (*bta_av_cb.p_cback)(BTA_AV_OFFLOAD_START_RSP_EVT, &value);

        break;

      default:

        break;
@@ -3080,7 +3080,7 @@ void offload_vendor_callback(tBTM_VSC_CMPL* param) { 
    APPL_TRACE_DEBUG("%s: Offload failed for subopcode= %d", __func__,

                     sub_opcode);

    if (param->opcode != VS_HCI_A2DP_OFFLOAD_STOP)

      (*bta_av_cb.p_cback)(BTA_AV_OFFLOAD_START_RSP_EVT, (tBTA_AV*)&status);

      (*bta_av_cb.p_cback)(BTA_AV_OFFLOAD_START_RSP_EVT, &value);

  }

}

system/btif/include/btif_keystore.h

+0 −8
Original line number Diff line number Diff line
@@ -59,14 +59,6 @@ class BtifKeystore { 
   */

  std::string Decrypt(const std::string& input_filename);



  /**

   * Check for existence of keystore key.

   *

   * This key can be cleared if a user manually wipes bluetooth storage data

   * b/133214365

   */

  bool DoesKeyExist();



 private:

  std::unique_ptr<keystore::KeystoreClient> keystore_client_;

  std::mutex api_mutex_;

system/btif/src/btif_config.cc

+1 −3
Original line number Diff line number Diff line
@@ -183,9 +183,7 @@ static BtifKeystore btif_keystore(new keystore::KeystoreClientImpl); 
static future_t* init(void) {

  std::unique_lock<std::recursive_mutex> lock(config_lock);



  if (is_factory_reset() ||

      (use_key_attestation() && !btif_keystore.DoesKeyExist()))

    delete_config_files();

  if (is_factory_reset()) delete_config_files();



  std::string file_source;

system/btif/src/btif_keystore.cc

+0 −4
Original line number Diff line number Diff line
@@ -98,8 +98,4 @@ KeyStoreNativeReturnCode BtifKeystore::GenerateKey(const std::string& name, 
                                       &software_enforced_characteristics);

}



bool BtifKeystore::DoesKeyExist() {

  return keystore_client_->doesKeyExist(kKeyStore);

}



}  // namespace bluetooth