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

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

Snap for 9690662 from 6d065549 to udc-release 

Change-Id: Iaae585c45ee4ba02871f0eb31f37a38edf5bc348
parents 3a3f807f 6d065549

audio/aidl/default/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -54,12 +54,13 @@ cc_library { 
    ],

}



cc_library_static {

cc_library {

    name: "libaudioserviceexampleimpl",

    defaults: [

        "aidlaudioservice_defaults",

        "latest_android_media_audio_common_types_ndk_shared",

        "latest_android_hardware_audio_core_ndk_shared",

        "latest_android_hardware_audio_core_sounddose_ndk_shared",

    ],

    export_include_dirs: ["include"],

    srcs: [

audio/aidl/vts/EffectHelper.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <aidl/android/media/audio/common/AudioChannelLayout.h>

#include <android/binder_auto_utils.h>

#include <fmq/AidlMessageQueue.h>

#include <gtest/gtest.h>

#include <system/audio_effects/aidl_effects_utils.h>



#include "AudioHalBinderServiceUtil.h"

audio/aidl/vts/TestUtils.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <iostream>



#include <android/binder_auto_utils.h>

#include <gtest/gtest_pred_impl.h>

#include <gtest/gtest.h>



namespace android::hardware::audio::common::testing {

automotive/can/1.0/default/libc++fs/src/filesystem/directory_iterator.cpp

+7 −7
Original line number Diff line number Diff line
@@ -169,8 +169,8 @@ public: 
  __dir_stream& operator=(const __dir_stream&) = delete;



  __dir_stream(__dir_stream&& other) noexcept : __stream_(other.__stream_),

                                                __root_(move(other.__root_)),

                                                __entry_(move(other.__entry_)) {

                                                __root_(std::move(other.__root_)),

                                                __entry_(std::move(other.__entry_)) {

    other.__stream_ = nullptr;

  }
@@ -252,7 +252,7 @@ directory_iterator& directory_iterator::__increment(error_code* ec) { 


  error_code m_ec;

  if (!__imp_->advance(m_ec)) {

    path root = move(__imp_->__root_);

    path root = std::move(__imp_->__root_);

    __imp_.reset();

    if (m_ec)

      err.report(m_ec, "at root \"%s\"", root);
@@ -286,7 +286,7 @@ recursive_directory_iterator::recursive_directory_iterator( 


  __imp_ = make_shared<__shared_imp>();

  __imp_->__options_ = opt;

  __imp_->__stack_.push(move(new_s));

  __imp_->__stack_.push(std::move(new_s));

}



void recursive_directory_iterator::__pop(error_code* ec) {
@@ -340,7 +340,7 @@ void recursive_directory_iterator::__advance(error_code* ec) { 
  }



  if (m_ec) {

    path root = move(stack.top().__root_);

    path root = std::move(stack.top().__root_);

    __imp_.reset();

    err.report(m_ec, "at root \"%s\"", root);

  } else {
@@ -374,7 +374,7 @@ bool recursive_directory_iterator::__try_recursion(error_code* ec) { 
  if (!skip_rec) {

    __dir_stream new_it(curr_it.__entry_.path(), __imp_->__options_, m_ec);

    if (new_it.good()) {

      __imp_->__stack_.push(move(new_it));

      __imp_->__stack_.push(std::move(new_it));

      return true;

    }

  }
@@ -385,7 +385,7 @@ bool recursive_directory_iterator::__try_recursion(error_code* ec) { 
      if (ec)

        ec->clear();

    } else {

      path at_ent = move(curr_it.__entry_.__p_);

      path at_ent = std::move(curr_it.__entry_.__p_);

      __imp_.reset();

      err.report(m_ec, "attempting recursion into \"%s\"", at_ent);

    }

bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp

+9 −6
Original line number Diff line number Diff line
@@ -516,12 +516,15 @@ void BluetoothHidlTest::sendAndCheckACL(int num_packets, size_t size, 
// Return the number of completed packets reported by the controller.

int BluetoothHidlTest::wait_for_completed_packets_event(uint16_t handle) {

  int packets_processed = 0;

  wait_for_event(false);

  if (event_queue.size() == 0) {

  while (true) {

    // There should be at least one event.

    wait_for_event(packets_processed == 0);

    if (event_queue.empty()) {

      if (packets_processed == 0) {

        ALOGW("%s: WaitForCallback timed out.", __func__);

      }

      return packets_processed;

    }

  while (event_queue.size() > 0) {

    hidl_vec<uint8_t> event = event_queue.front();

    event_queue.pop();