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

Commit 6f44f305 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "aosp-hal-enum-strings" am: 691ebfea am: cbf8ba95 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1515660

Change-Id: Id8ceeda379f65c445e48f92ffad450d7ffd61e88
parents 7d9fcc55 cbf8ba95

services/audiopolicy/config/audio_policy_configuration.xml

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 
                <!-- Output devices declaration, i.e. Sink DEVICE PORT -->

                <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">

                   <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                            samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>

                            samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>

                </devicePort>

                <devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

services/audiopolicy/config/audio_policy_configuration_7_0.xml

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 
                <!-- Output devices declaration, i.e. Sink DEVICE PORT -->

                <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">

                   <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                            samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>

                            samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>

                </devicePort>

                <devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"