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

Commit 2eacec6b authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cuttlefish_aidl_audio-3" into main am: 44a679e5 am: 75c1fd81 

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



Change-Id: I47e5123837a459a34f9ee259077fafd5acc9ae77
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 797dee0e 75c1fd81

media/java/android/media/AudioHalVersionInfo.java

+2 −3
Original line number Diff line number Diff line
@@ -75,11 +75,10 @@ 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.

     * defined in frameworks/av/media/libaudiohal/FactoryHal.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();

services/core/java/com/android/server/audio/AudioService.java

+9 −5
Original line number Diff line number Diff line
@@ -12201,12 +12201,16 @@ public class AudioService extends IAudioService.Stub 
    public @Nullable AudioHalVersionInfo getHalVersion() {

        for (AudioHalVersionInfo version : AudioHalVersionInfo.VERSIONS) {

            try {

                // TODO: check AIDL service.

                String versionStr = version.getMajorVersion() + "." + version.getMinorVersion();

                HwBinder.getService(

                        String.format("android.hardware.audio@%s::IDevicesFactory", versionStr),

                        "default");

                final String aidlStr = "android.hardware.audio.core.IModule/default";

                final String hidlStr = String.format("android.hardware.audio@%s::IDevicesFactory",

                        versionStr);

                if (null != ServiceManager.checkService(aidlStr)) {

                    return version;

                } else {

                    HwBinder.getService(hidlStr, "default");

                    return version;

                }

            } catch (NoSuchElementException e) {

                // Ignore, the specified HAL interface is not found.

            } catch (RemoteException re) {