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

Commit 65cd3915 authored by Jiabin Huang's avatar Jiabin Huang Committed by Automerger Merge Worker
Browse files

Merge "Add HAL version 5.0 for getHalVersion API." into tm-dev am: 028c5281 

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



Change-Id: Ib2f6d0be0c0fc31e8870e65901a88dd45761552a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 772b657f 028c5281

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

+2 −1
Original line number Diff line number Diff line
@@ -10737,7 +10737,8 @@ public class AudioService extends IAudioService.Stub 
        return mMediaFocusControl.sendFocusLoss(focusLoser);

    }



    private static final String[] HAL_VERSIONS = new String[] {"7.1", "7.0", "6.0", "4.0", "2.0"};

    private static final String[] HAL_VERSIONS =

            new String[] {"7.1", "7.0", "6.0", "5.0", "4.0", "2.0"};



    /** @see AudioManager#getHalVersion */

    public @Nullable String getHalVersion() {