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

Commit a2262c1f authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Gerrit Code Review
Browse files

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

parents 6e39bef5 fef58f8c

media/java/android/media/AudioHalVersionInfo.java

+2 −1
Original line number Original line 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

     * List of all valid Audio HAL versions. This list need to be in sync with sAudioHALVersions

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

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

     */

     */

    // TODO: add AIDL_1_0 with sAudioHALVersions.

    public static final @NonNull List<AudioHalVersionInfo> VERSIONS =

    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 static final String TAG = "AudioHalVersionInfo";

    private AudioHalVersion mHalVersion = new AudioHalVersion();

    private AudioHalVersion mHalVersion = new AudioHalVersion();