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

Commit 7d23f3e3 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "Revert "Enable AIDL HAL support in the framework"" into main am: a2262c1f 

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



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

media/java/android/media/AudioHalVersionInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -77,8 +77,9 @@ 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(AIDL_1_0, HIDL_7_1, HIDL_7_0, HIDL_6_0, HIDL_5_0, HIDL_4_0);

            List.of(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();