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

Commit 7f3e5610 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:... 

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

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



Change-Id: I734fcde3b58d6cce06a71ef65aacca3651fb715c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e8e346c 4279f827

media/java/android/media/AudioHalVersionInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -80,8 +80,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();