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

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

Merge "floss: libhrome r939949 uprev" am: fe6f2d01 am: 32aa8679 

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

Change-Id: Ib943a197f31b67c00aed6ad909042471b40d5b0c
parents 222dbfd9 32aa8679

system/bta/av/bta_av_main.cc

+8 −0
Original line number Diff line number Diff line
@@ -134,7 +134,11 @@ static void bta_av_api_enable(tBTA_AV_DATA* p_data) { 
      tBTA_AV_API_ENABLE* p_buf =

          (tBTA_AV_API_ENABLE*)osi_malloc(sizeof(tBTA_AV_API_ENABLE));

      memcpy(p_buf, &p_data->api_enable, sizeof(tBTA_AV_API_ENABLE));

#if BASE_VER < 931007

      bta_sys_sendmsg_delayed(p_buf, base::TimeDelta::FromMilliseconds(

#else

      bta_sys_sendmsg_delayed(p_buf, base::Milliseconds(

#endif

                                         kEnablingAttemptsIntervalMs));

      return;

    }
@@ -407,7 +411,11 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) { 
        (tBTA_AV_API_REG*)osi_malloc(sizeof(tBTA_AV_API_REG));

    memcpy(p_buf, &p_data->api_reg, sizeof(tBTA_AV_API_REG));

    bta_sys_sendmsg_delayed(

#if BASE_VER < 931007

        p_buf, base::TimeDelta::FromMilliseconds(kEnablingAttemptsIntervalMs));

#else

        p_buf, base::Milliseconds(kEnablingAttemptsIntervalMs));

#endif

    return;

  }

system/bta/hearing_aid/hearing_aid_audio_source.cc

+4 −0
Original line number Diff line number Diff line
@@ -128,7 +128,11 @@ void start_audio_ticks() { 
  wakelock_acquire();

  audio_timer.SchedulePeriodic(

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

#if BASE_VER < 931007

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

#else

      base::Milliseconds(data_interval_ms));

#endif

  LOG(INFO) << __func__ << ": running with data interval: " << data_interval_ms;

}

system/bta/le_audio/client_audio.cc

+4 −0
Original line number Diff line number Diff line
@@ -106,7 +106,11 @@ void start_audio_ticks() { 
  wakelock_acquire();

  audio_timer.SchedulePeriodic(

      worker_thread.GetWeakPtr(), FROM_HERE, base::Bind(&send_audio_data),

#if BASE_VER < 931007

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

#else

      base::Microseconds(source_codec_config.data_interval_us));

#endif

}



void stop_audio_ticks() {

system/btif/src/btif_a2dp_source.cc

+4 −0
Original line number Diff line number Diff line
@@ -810,7 +810,11 @@ static void btif_a2dp_source_audio_tx_start_event(void) { 
  btif_a2dp_source_cb.media_alarm.SchedulePeriodic(

      btif_a2dp_source_thread.GetWeakPtr(), FROM_HERE,

      base::Bind(&btif_a2dp_source_audio_handle_timer),

#if BASE_VER < 931007

      base::TimeDelta::FromMilliseconds(

#else

      base::Milliseconds(

#endif

          btif_a2dp_source_cb.encoder_interface->get_encoder_interval_ms()));



  btif_a2dp_source_cb.stats.Reset();

system/common/benchmark/timer_performance_benchmark.cc

+8 −0
Original line number Diff line number Diff line
@@ -133,7 +133,11 @@ BENCHMARK_DEFINE_F(BM_AlarmTaskTimer, timer_performance_ms)(State& state) { 
    auto start_time_point = time_get_os_boottime_us();

    once_timer_->Schedule(message_loop_thread_->GetWeakPtr(), FROM_HERE,

                          base::BindOnce(&TimerFire, nullptr),

#if BASE_VER < 931007

                          base::TimeDelta::FromMilliseconds(milliseconds));

#else

                          base::Milliseconds(milliseconds));

#endif

    g_promise->get_future().get();

    once_timer_->Cancel();

    auto end_time_point = time_get_os_boottime_us();
@@ -246,7 +250,11 @@ BENCHMARK_DEFINE_F(BM_AlarmTaskPeriodicTimer, periodic_accuracy) 
    repeating_timer_->SchedulePeriodic(

        message_loop_thread_->GetWeakPtr(), FROM_HERE,

        base::BindRepeating(&AlarmSleepAndCountDelayedTime, nullptr),

#if BASE_VER < 931007

        base::TimeDelta::FromMilliseconds(g_task_interval));

#else

        base::Milliseconds(g_task_interval));

#endif

    g_promise->get_future().get();

    repeating_timer_->Cancel();

  }