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

Commit 0749204d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11286711 from c20e62f2 to 24Q2-release 

Change-Id: Ia8ec2250115c97a5d4b9b7613306ef5e5083f8a4
parents b240a922 c20e62f2

flags/opp.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"



flag {

    name: "opp_start_activity_directly_from_notification"

    namespace: "bluetooth"

    description: "Make OPP notification start activities directly from it, not via OppReceiver"

    bug: "319050411"

}

flags/vcp.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"



flag {

    name: "vcp_mute_unmute"

    namespace: "bluetooth"

    description: "Allow muting/unmuting the remote device"

    bug: "318775507"

}

system/audio_hal_interface/aidl/a2dp_encoding_aidl.cc

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ BluetoothAudioSinkClientInterface* active_hal_interface = nullptr; 
// ProviderInfo for A2DP hardware offload encoding and decoding data paths,

// if supported by the HAL and enabled. nullptr if not supported

// or disabled.

::bluetooth::audio::aidl::a2dp::ProviderInfo* provider_info;

std::unique_ptr<::bluetooth::audio::aidl::a2dp::ProviderInfo> provider_info;



// Save the value if the remote reports its delay before this interface is

// initialized

system/audio_hal_interface/aidl/hfp_client_interface_aidl.cc

+10 −6
Original line number Diff line number Diff line
@@ -121,12 +121,6 @@ BluetoothAudioCtrlAck HfpTransport::SuspendRequest() { 


void HfpTransport::SetLatencyMode(LatencyMode latency_mode) {}



bool GetPresentationPosition(uint64_t* remote_delay_report_ns,

                             uint64_t* total_bytes_read,

                             timespec* data_position) {

  return false;

}



void HfpTransport::SourceMetadataChanged(

    const source_metadata_v7_t& source_metadata) {}
@@ -134,6 +128,12 @@ void HfpTransport::SinkMetadataChanged(const sink_metadata_v7_t&) {} 


void HfpTransport::ResetPresentationPosition() {}



bool HfpTransport::GetPresentationPosition(uint64_t* remote_delay_report_ns,

                                           uint64_t* total_bytes_read,

                                           timespec* data_position) {

  return false;

}



// Source / sink functions

HfpDecodingTransport::HfpDecodingTransport(SessionType session_type)

    : IBluetoothSinkTransportInstance(session_type, (AudioConfiguration){}) {
@@ -185,6 +185,8 @@ uint8_t HfpDecodingTransport::GetPendingCmd() const { 


void HfpDecodingTransport::ResetPendingCmd() { transport_->ResetPendingCmd(); }



void HfpDecodingTransport::StopRequest() { transport_->StopRequest(); }



HfpEncodingTransport::HfpEncodingTransport(SessionType session_type)

    : IBluetoothSourceTransportInstance(session_type, (AudioConfiguration){}) {

  transport_ = new HfpTransport();
@@ -200,6 +202,8 @@ BluetoothAudioCtrlAck HfpEncodingTransport::SuspendRequest() { 
  return transport_->SuspendRequest();

}



void HfpEncodingTransport::StopRequest() { transport_->StopRequest(); }



void HfpEncodingTransport::SetLatencyMode(LatencyMode latency_mode) {

  transport_->SetLatencyMode(latency_mode);

}

system/audio_hal_interface/aidl/provider_info.cc

+3 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ using ::aidl::android::hardware::bluetooth::audio::SessionType; 
 * getProviderInfo, or if the feature flag for codec

 * extensibility is disabled.

 ***/

ProviderInfo* ProviderInfo::GetProviderInfo() {

std::unique_ptr<ProviderInfo> ProviderInfo::GetProviderInfo() {

  if (!IS_FLAG_ENABLED(a2dp_offload_codec_extensibility)) {

    LOG(INFO) << "a2dp offload codec extensibility is disabled;"

              << " not going to load the ProviderInfo";
@@ -79,7 +79,8 @@ ProviderInfo* ProviderInfo::GetProviderInfo() { 
    sink_codecs = std::move(sink_provider_info->codecInfos);

  }



  return new ProviderInfo(std::move(source_codecs), std::move(sink_codecs));

  return std::make_unique<ProviderInfo>(std::move(source_codecs),

                                        std::move(sink_codecs));

}



/***