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

Commit 82962895 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio policy: engine configurable: change default in call routing for...

Merge "audio policy: engine configurable: change default in call routing for line out device" into nyc-dev
parents ba388ac4 e358ea3f
Loading
Loading
Loading
Loading
+62 −156
Original line number Diff line number Diff line
@@ -939,6 +939,12 @@
          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
        </CompoundRule>
      </Configuration>
      <Configuration Name="Line">
        <CompoundRule Type="All">
          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
        </CompoundRule>
      </Configuration>
      <Configuration Name="UsbDevice">
        <CompoundRule Type="All">
          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
@@ -988,12 +994,6 @@
          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
        </CompoundRule>
      </Configuration>
      <Configuration Name="Line">
        <CompoundRule Type="All">
          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
        </CompoundRule>
      </Configuration>
      <Configuration Name="Speaker">
        <CompoundRule Type="All">
          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>
@@ -1448,7 +1448,7 @@
          <BitParameter Name="speaker">0</BitParameter>
        </ConfigurableElement>
      </Configuration>
      <Configuration Name="UsbDevice">
      <Configuration Name="Line">
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
          <BitParameter Name="earpiece">0</BitParameter>
        </ConfigurableElement>
@@ -1489,19 +1489,19 @@
          <BitParameter Name="usb_accessory">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
          <BitParameter Name="usb_device">1</BitParameter>
          <BitParameter Name="usb_device">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
          <BitParameter Name="telephony_tx">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
          <BitParameter Name="line">0</BitParameter>
          <BitParameter Name="line">1</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
          <BitParameter Name="speaker">0</BitParameter>
        </ConfigurableElement>
      </Configuration>
      <Configuration Name="UsbAccessory">
      <Configuration Name="UsbDevice">
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
          <BitParameter Name="earpiece">0</BitParameter>
        </ConfigurableElement>
@@ -1554,7 +1554,7 @@
          <BitParameter Name="speaker">0</BitParameter>
        </ConfigurableElement>
      </Configuration>
      <Configuration Name="DgtlDockHeadset">
      <Configuration Name="UsbAccessory">
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
          <BitParameter Name="earpiece">0</BitParameter>
        </ConfigurableElement>
@@ -1589,13 +1589,13 @@
          <BitParameter Name="angl_dock_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
          <BitParameter Name="usb_accessory">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_device">
          <BitParameter Name="usb_device">0</BitParameter>
          <BitParameter Name="usb_device">1</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/telephony_tx">
          <BitParameter Name="telephony_tx">0</BitParameter>
@@ -1607,7 +1607,7 @@
          <BitParameter Name="speaker">0</BitParameter>
        </ConfigurableElement>
      </Configuration>
      <Configuration Name="Hdmi">
      <Configuration Name="DgtlDockHeadset">
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
          <BitParameter Name="earpiece">0</BitParameter>
        </ConfigurableElement>
@@ -1636,13 +1636,13 @@
          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
          <BitParameter Name="hdmi">1</BitParameter>
          <BitParameter Name="hdmi">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
          <BitParameter Name="angl_dock_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
          <BitParameter Name="dgtl_dock_headset">1</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/usb_accessory">
          <BitParameter Name="usb_accessory">0</BitParameter>
@@ -1660,7 +1660,7 @@
          <BitParameter Name="speaker">0</BitParameter>
        </ConfigurableElement>
      </Configuration>
      <Configuration Name="AnlgDockHeadset">
      <Configuration Name="Hdmi">
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
          <BitParameter Name="earpiece">0</BitParameter>
        </ConfigurableElement>
@@ -1689,10 +1689,10 @@
          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">
          <BitParameter Name="hdmi">0</BitParameter>
          <BitParameter Name="hdmi">1</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
          <BitParameter Name="angl_dock_headset">1</BitParameter>
          <BitParameter Name="angl_dock_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
@@ -1713,9 +1713,9 @@
          <BitParameter Name="speaker">0</BitParameter>
        </ConfigurableElement>
      </Configuration>
      <Configuration Name="Earpiece">
      <Configuration Name="AnlgDockHeadset">
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
          <BitParameter Name="earpiece">1</BitParameter>
          <BitParameter Name="earpiece">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
          <BitParameter Name="wired_headset">0</BitParameter>
@@ -1745,7 +1745,7 @@
          <BitParameter Name="hdmi">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/angl_dock_headset">
          <BitParameter Name="angl_dock_headset">0</BitParameter>
          <BitParameter Name="angl_dock_headset">1</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/dgtl_dock_headset">
          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
@@ -1766,9 +1766,9 @@
          <BitParameter Name="speaker">0</BitParameter>
        </ConfigurableElement>
      </Configuration>
      <Configuration Name="Line">
      <Configuration Name="Earpiece">
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/earpiece">
          <BitParameter Name="earpiece">0</BitParameter>
          <BitParameter Name="earpiece">1</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/wired_headset">
          <BitParameter Name="wired_headset">0</BitParameter>
@@ -1813,7 +1813,7 @@
          <BitParameter Name="telephony_tx">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/line">
          <BitParameter Name="line">1</BitParameter>
          <BitParameter Name="line">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">
          <BitParameter Name="speaker">0</BitParameter>
@@ -2093,7 +2093,8 @@
                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
              </CompoundRule>
              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
            </CompoundRule>
            <CompoundRule Type="All">
              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
@@ -3082,13 +3083,26 @@
          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
        </CompoundRule>
      </Configuration>
      <Configuration Name="LineWhenFollowMediaStrategy">
      <Configuration Name="Line">
        <CompoundRule Type="All">
          <CompoundRule Type="Any">
            <CompoundRule Type="All">
              <CompoundRule Type="Any">
                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
              </CompoundRule>
              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
            </CompoundRule>
            <CompoundRule Type="All">
              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
            </CompoundRule>
          </CompoundRule>
          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
        </CompoundRule>
      </Configuration>
      <Configuration Name="WiredHeadset">
        <CompoundRule Type="All">
@@ -3172,16 +3186,6 @@
          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Earpiece"/>
        </CompoundRule>
      </Configuration>
      <Configuration Name="Line">
        <CompoundRule Type="All">
          <CompoundRule Type="Any">
            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
          </CompoundRule>
          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
        </CompoundRule>
      </Configuration>
    </Configurations>
    <ConfigurableElements>
      <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece"/>
@@ -3530,7 +3534,7 @@
          <BitParameter Name="hdmi">0</BitParameter>
        </ConfigurableElement>
      </Configuration>
      <Configuration Name="LineWhenFollowMediaStrategy">
      <Configuration Name="Line">
        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
          <BitParameter Name="earpiece">0</BitParameter>
        </ConfigurableElement>
@@ -3906,53 +3910,6 @@
          <BitParameter Name="hdmi">0</BitParameter>
        </ConfigurableElement>
      </Configuration>
      <Configuration Name="Line">
        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/earpiece">
          <BitParameter Name="earpiece">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco">
          <BitParameter Name="bluetooth_sco">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_headset">
          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_sco_carkit">
          <BitParameter Name="bluetooth_sco_carkit">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_headphones">
          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp_speaker">
          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/bluetooth_a2dp">
          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headset">
          <BitParameter Name="wired_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/wired_headphone">
          <BitParameter Name="wired_headphone">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/line">
          <BitParameter Name="line">1</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/angl_dock_headset">
          <BitParameter Name="angl_dock_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/dgtl_dock_headset">
          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_accessory">
          <BitParameter Name="usb_accessory">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/usb_device">
          <BitParameter Name="usb_device">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/sonification_respectful/selected_output_devices/mask/hdmi">
          <BitParameter Name="hdmi">0</BitParameter>
        </ConfigurableElement>
      </Configuration>
    </Settings>
  </ConfigurableDomain>
  <ConfigurableDomain Name="DeviceForStrategy.Dtmf.UnreachableDevices" SequenceAware="false">
@@ -4060,10 +4017,22 @@
          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="WiredHeadphone"/>
        </CompoundRule>
      </Configuration>
      <Configuration Name="LineWhenFollowingMedia">
      <Configuration Name="Line">
        <CompoundRule Type="All">
          <CompoundRule Type="Any">
            <CompoundRule Type="All">
              <CompoundRule Type="Any">
                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
                <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
              </CompoundRule>
              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="WiredHeadset"/>
            </CompoundRule>
            <CompoundRule Type="All">
              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
            </CompoundRule>
          </CompoundRule>
          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
        </CompoundRule>
      </Configuration>
@@ -4144,16 +4113,6 @@
          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceSpeaker"/>
        </CompoundRule>
      </Configuration>
      <Configuration Name="LineWhenFallThroughPhone">
        <CompoundRule Type="All">
          <CompoundRule Type="Any">
            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCall"/>
            <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="Is" Value="InCommunication"/>
          </CompoundRule>
          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Line"/>
          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
        </CompoundRule>
      </Configuration>
      <Configuration Name="Speaker">
        <CompoundRule Type="All">
          <CompoundRule Type="Any">
@@ -4621,7 +4580,7 @@
          <BitParameter Name="speaker">0</BitParameter>
        </ConfigurableElement>
      </Configuration>
      <Configuration Name="LineWhenFollowingMedia">
      <Configuration Name="Line">
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
          <BitParameter Name="remote_submix">0</BitParameter>
        </ConfigurableElement>
@@ -5045,59 +5004,6 @@
          <BitParameter Name="speaker">0</BitParameter>
        </ConfigurableElement>
      </Configuration>
      <Configuration Name="LineWhenFallThroughPhone">
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
          <BitParameter Name="remote_submix">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/earpiece">
          <BitParameter Name="earpiece">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headset">
          <BitParameter Name="wired_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/wired_headphone">
          <BitParameter Name="wired_headphone">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco">
          <BitParameter Name="bluetooth_sco">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_sco_headset">
          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp">
          <BitParameter Name="bluetooth_a2dp">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_headphones">
          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/bluetooth_a2dp_speaker">
          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/hdmi">
          <BitParameter Name="hdmi">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/angl_dock_headset">
          <BitParameter Name="angl_dock_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/dgtl_dock_headset">
          <BitParameter Name="dgtl_dock_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_accessory">
          <BitParameter Name="usb_accessory">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/usb_device">
          <BitParameter Name="usb_device">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/telephony_tx">
          <BitParameter Name="telephony_tx">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/line">
          <BitParameter Name="line">1</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/speaker">
          <BitParameter Name="speaker">0</BitParameter>
        </ConfigurableElement>
      </Configuration>
      <Configuration Name="Speaker">
        <ConfigurableElement Path="/Policy/policy/strategies/dtmf/selected_output_devices/mask/remote_submix">
          <BitParameter Name="remote_submix">0</BitParameter>
+18 −35
Original line number Diff line number Diff line
@@ -245,10 +245,22 @@ supDomain: DeviceForStrategy
					line = 0
					speaker = 0

			conf: LineWhenFollowingMedia
			conf: Line
				ANY
					#
					# DTMF falls through Phone strategy if in call
					# but Line has a lower priority than WiredHeadset in this case.
					#
					ALL
						ANY
							TelephonyMode Is InCall
							TelephonyMode Is InCommunication
						ForceUseForCommunication IsNot ForceSpeaker
						AvailableOutputDevices Excludes WiredHeadset
					#
					# DTMF follows Media strategy if not in call
					#
					ALL
						TelephonyMode IsNot InCall
						TelephonyMode IsNot InCommunication
				AvailableOutputDevices Includes Line
@@ -501,35 +513,6 @@ supDomain: DeviceForStrategy
					line = 0
					speaker = 0

			conf: LineWhenFallThroughPhone
				#
				# DTMF falls through Phone strategy if in call
				#
				ANY
					TelephonyMode Is InCall
					TelephonyMode Is InCommunication
				AvailableOutputDevices Includes Line
				ForceUseForCommunication Is ForceSpeaker

				component: /Policy/policy/strategies/dtmf/selected_output_devices/mask
					remote_submix = 0
					earpiece = 0
					wired_headset = 0
					wired_headphone = 0
					bluetooth_sco = 0
					bluetooth_sco_headset = 0
					bluetooth_a2dp = 0
					bluetooth_a2dp_headphones = 0
					bluetooth_a2dp_speaker = 0
					hdmi = 0
					angl_dock_headset = 0
					dgtl_dock_headset = 0
					usb_accessory = 0
					usb_device = 0
					telephony_tx = 0
					line = 1
					speaker = 0

			conf: Speaker
				ANY
					#
+23 −27

File changed.

Preview size limit exceeded, changes collapsed.

+3 −1

File changed.

Preview size limit exceeded, changes collapsed.

+23 −35

File changed.

Preview size limit exceeded, changes collapsed.