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

Commit 18c78ee6 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "Enable AIDL HAL support in the framework" into main am: 72e4b15a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2862771



Change-Id: I17c15a12a16ef124fa6a70d9c9d13f16ebb1b1b7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65054f33 72e4b15a

media/java/android/media/AudioHalVersionInfo.java

+1 −2
Original line number Diff line number Diff line
@@ -77,9 +77,8 @@ public final class AudioHalVersionInfo implements Parcelable, Comparable<AudioHa 
     * List of all valid Audio HAL versions. This list need to be in sync with sAudioHALVersions

     * defined in frameworks/av/media/libaudiohal/FactoryHalHidl.cpp.

     */

    // TODO: add AIDL_1_0 with sAudioHALVersions.

    public static final @NonNull List<AudioHalVersionInfo> VERSIONS =

            List.of(HIDL_7_1, HIDL_7_0, HIDL_6_0, HIDL_5_0, HIDL_4_0);

            List.of(AIDL_1_0, HIDL_7_1, HIDL_7_0, HIDL_6_0, HIDL_5_0, HIDL_4_0);



    private static final String TAG = "AudioHalVersionInfo";

    private AudioHalVersion mHalVersion = new AudioHalVersion();