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

Commit 518d3f71 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge changes Ibc4f114a,I7b0bce14,I793f79bc into main am: 6c16badd 

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



Change-Id: I68b7af1b7f8f2a15fce81ad2c586d39d0392bf90
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73db0b88 6c16badd

system/audio_hal_interface/fuzzer/libbt_audio_hal_a2dp_encoding_fuzzer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ void A2dpEncodingFuzzer::process(const uint8_t* data, size_t size) { 
  std::string name = fdp.ConsumeRandomLengthString(kRandomStringLength);

  bluetooth::common::MessageLoopThread messageLoopThread(name);

  messageLoopThread.StartUp();

  messageLoopThread.DoInThread(FROM_HERE, base::Bind(&source_init_delayed));

  messageLoopThread.DoInThread(FROM_HERE, base::BindOnce(&source_init_delayed));



  uint16_t delayReport = fdp.ConsumeIntegral<uint16_t>();

  bluetooth::audio::a2dp::set_remote_delay(delayReport);

system/audio_hal_interface/fuzzer/libbt_audio_hal_hearing_aid_software_encoding_fuzzer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { 
  std::string name = fdp.ConsumeRandomLengthString(kRandomStringLength);

  bluetooth::common::MessageLoopThread messageLoopThread(name);

  messageLoopThread.StartUp();

  messageLoopThread.DoInThread(FROM_HERE, base::Bind(&source_init_delayed));

  messageLoopThread.DoInThread(FROM_HERE, base::BindOnce(&source_init_delayed));



  uint16_t delay = fdp.ConsumeIntegral<uint16_t>();

  bluetooth::audio::hearing_aid::set_remote_delay(delay);

system/audio_hal_interface/fuzzer/libbt_audio_hal_le_audio_software_fuzzer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { 
  std::string name = fdp.ConsumeRandomLengthString(kRandomStringLength);

  bluetooth::common::MessageLoopThread messageLoopThread(name);

  messageLoopThread.StartUp();

  messageLoopThread.DoInThread(FROM_HERE, base::Bind(&source_init_delayed));

  messageLoopThread.DoInThread(FROM_HERE, base::BindOnce(&source_init_delayed));



  LeAudioClientInterface* interface = LeAudioClientInterface::Get();

system/bta/hearing_aid/hearing_aid_audio_source.cc

+2 −1
Original line number Diff line number Diff line
@@ -129,7 +129,8 @@ void start_audio_ticks() { 


  wakelock_acquire();

  audio_timer.SchedulePeriodic(

      get_main_thread()->GetWeakPtr(), FROM_HERE, base::Bind(&send_audio_data),

      get_main_thread()->GetWeakPtr(), FROM_HERE,

      base::BindRepeating(&send_audio_data),

#if BASE_VER < 931007

      base::TimeDelta::FromMilliseconds(data_interval_ms));

#else

system/bta/le_audio/audio_hal_client/audio_source_hal_client.cc

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ void SourceImpl::StartAudioTicks() { 
  }

  audio_timer_.SchedulePeriodic(

      worker_thread_->GetWeakPtr(), FROM_HERE,

      base::Bind(&SourceImpl::SendAudioData, base::Unretained(this)),

      base::BindRepeating(&SourceImpl::SendAudioData, base::Unretained(this)),

#if BASE_VER < 931007

      base::TimeDelta::FromMicroseconds(source_codec_config_.data_interval_us));

#else