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

Commit 8709840c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [15560884, 15560845, 15560903, 15560904, 15560905,... 

Merge cherrypicks of [15560884, 15560845, 15560903, 15560904, 15560905, 15560906, 15560769, 15560755, 15557357, 15557358] into sc-release

Change-Id: I428e447350b128585f51711697844f38f281c884
parents 4c1de167 f865f8e8

system/audio_hal_interface/a2dp_encoding.cc

+2 −0
Original line number Diff line number Diff line
@@ -474,6 +474,8 @@ void end_session() { 
    return;

  }

  active_hal_interface->EndSession();

  static_cast<A2dpTransport*>(active_hal_interface->GetTransportInstance())

      ->ResetPendingCmd();

  static_cast<A2dpTransport*>(active_hal_interface->GetTransportInstance())

      ->ResetPresentationPosition();

}

system/stack/btm/btm_inq.cc

+3 −1
Original line number Diff line number Diff line
@@ -534,8 +534,10 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 


  if (controller_get_interface()->supports_ble()) {

    btm_ble_start_inquiry(p_inq->inqparms.duration);

  }

  } else {

    LOG_WARN("Trying to do LE scan on a non-LE adapter");

    p_inq->inqparms.mode &= ~BTM_BLE_INQUIRY_MASK;

  }



  btm_acl_update_inquiry_status(BTM_INQUIRY_STARTED);