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

Commit a97cb0b1 authored by Kevin Rocard's avatar Kevin Rocard Committed by android-build-merger
Browse files

Merge changes from topic "audio-hal-v4" into pi-dev

am: 14dc815c

Change-Id: Id2d9a430b686eb1fc947662c66a0a8d6f4a3223c
parents c44f2e60 14dc815c
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ class ReturnIn {
    template <class Head, class... Tail>
    void set(Head&& head, Tail&&... tail) {
        std::get<sizeof...(ResultStore) - sizeof...(Tail) - 1>(results) = std::forward<Head>(head);
        set(tail...);
        set(std::forward<Tail>(tail)...);
    }
    // Trivial case
    void set() {}
@@ -56,7 +56,7 @@ class ReturnIn {
}  // namespace detail

// Generate the HIDL synchronous callback with a copy policy
// Input: the variables (lvalue reference) where to save the return values
// Input: the variables (lvalue references) where to copy the return values
// Output: the callback to provide to a HIDL call with a synchronous callback
// The output parameters *will be copied* do not use this function if you have
// a zero copy policy
+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,12 @@ auto mkEnumConverter(Source source) {
    return EnumConverter<Source, Destination>{source};
}

/** Allows converting an enum to its bitfield or itself. */
template <class Enum>
EnumConverter<Enum> mkBitfield(Enum value) {
    return EnumConverter<Enum>{value};
}

}  // namespace utils
}  // namespace common
}  // namespace audio
+5 −0
Original line number Diff line number Diff line
elaurent@google.com
krocard@google.com
mnaganov@google.com
yim@google.com
zhuoyao@google.com
 No newline at end of file
+36 −0
Original line number Diff line number Diff line
//
// Copyright (C) 2017 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//      http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

cc_test {
    name: "VtsHalAudioV4_0TargetTest",
    defaults: ["VtsHalTargetTestDefaults"],
    srcs: [
        "AudioPrimaryHidlHalTest.cpp",
        "ValidateAudioConfiguration.cpp"
    ],
    static_libs: [
        "android.hardware.audio.common.test.utility",
        "android.hardware.audio@4.0",
        "android.hardware.audio.common@4.0",
        "libxml2",
    ],
    shared_libs: [
        "libicuuc",
    ],
    header_libs: [
        "android.hardware.audio.common.util@all-versions",
    ],
}
+1324 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading