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

Commit 0b278b26 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "Add AudioHalVersion definition" am: 7823920a am: f3e1b341 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2319787



Change-Id: I73c89527eaa497ea2460d4ce6de8e8d0b69f1d09
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fba2d60d f3e1b341

media/libaudioclient/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ filegroup { 
    name: "libaudioclient_aidl",

    srcs: [

        "aidl/android/media/IPlayer.aidl",

        "aidl/android/media/AudioHalVersion.aidl",

    ],

    path: "aidl",

}
@@ -342,6 +343,7 @@ aidl_interface { 
        "aidl/android/media/AudioDualMonoMode.aidl",

        "aidl/android/media/AudioFlag.aidl",

        "aidl/android/media/AudioGainSys.aidl",

        "aidl/android/media/AudioHalVersion.aidl",

        "aidl/android/media/AudioIoConfigEvent.aidl",

        "aidl/android/media/AudioIoDescriptor.aidl",

        "aidl/android/media/AudioPatch.aidl",

media/libaudioclient/aidl/android/media/AudioHalVersion.aidl

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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.

 */



package android.media;



/**

 * The audio HAL version definition.

 *

 * {@hide}

 */

parcelable AudioHalVersion {



    @Backing(type="int")

    enum Type {

        /**

         * Indicate the audio HAL is implemented with HIDL (HAL interface definition language).

         * @see <a href="https://source.android.com/docs/core/architecture/hidl/">HIDL</a>

         */

        HIDL = 0,



        /**

         * Indicate the audio HAL is implemented with AIDL (Android Interface Definition Language).

         * @see <a href="https://source.android.com/docs/core/architecture/aidl/">AIDL</a>

         */

        AIDL

    }



    Type type = Type.HIDL;



    /**

     * Major version number.

     */

    int major;



    /**

     * Minor version number.

     */

    int minor;

}