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

Commit 6a8bd793 authored by Thomas Lin's avatar Thomas Lin Committed by Automerger Merge Worker
Browse files

Merge "Exclude "Spatial Audio" setting from hearing aids" into udc-dev am: 24bc2fac 

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



Change-Id: I31e6ea9ac067184277b905bfe50f9042800cba6e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ae6a4df9 24bc2fac

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

+1 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public class SpatializerHelper { 


    //------------------------------------------------------------



    private static final SparseIntArray SPAT_MODE_FOR_DEVICE_TYPE = new SparseIntArray(15) {

    private static final SparseIntArray SPAT_MODE_FOR_DEVICE_TYPE = new SparseIntArray(14) {

        {

            append(AudioDeviceInfo.TYPE_BUILTIN_SPEAKER, SpatializationMode.SPATIALIZER_TRANSAURAL);

            append(AudioDeviceInfo.TYPE_WIRED_HEADSET, SpatializationMode.SPATIALIZER_BINAURAL);
@@ -91,7 +91,6 @@ public class SpatializerHelper { 
            append(AudioDeviceInfo.TYPE_LINE_ANALOG, SpatializationMode.SPATIALIZER_TRANSAURAL);

            append(AudioDeviceInfo.TYPE_LINE_DIGITAL, SpatializationMode.SPATIALIZER_TRANSAURAL);

            append(AudioDeviceInfo.TYPE_AUX_LINE, SpatializationMode.SPATIALIZER_TRANSAURAL);

            append(AudioDeviceInfo.TYPE_HEARING_AID, SpatializationMode.SPATIALIZER_BINAURAL);

            append(AudioDeviceInfo.TYPE_BLE_HEADSET, SpatializationMode.SPATIALIZER_BINAURAL);

            append(AudioDeviceInfo.TYPE_BLE_SPEAKER, SpatializationMode.SPATIALIZER_TRANSAURAL);

            // assumption that BLE broadcast would be mostly consumed on headsets