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

Commit be57ee08 authored by Di Folco, Neil's avatar Di Folco, Neil Committed by android-build-merger
Browse files

Merge "Configurable Audio Policy: Various fixes" into oc-dev

am: cbd0e571

Change-Id: I8567cdb3fc782c123b6a11ce37d38a72fbb9157c
parents fb77f14d cbd0e571
Loading
Loading
Loading
Loading
+77 −5
Original line number Diff line number Diff line
@@ -3062,7 +3062,7 @@
        <CompoundRule Type="All">
          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceNoBtA2dp"/>
          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>
        </CompoundRule>
      </Configuration>
@@ -3070,7 +3070,7 @@
        <CompoundRule Type="All">
          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceNoBtA2dp"/>
          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>
        </CompoundRule>
      </Configuration>
@@ -3078,7 +3078,7 @@
        <CompoundRule Type="All">
          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="Is" Value="ForceNoBtA2dp"/>
          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>
          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>
        </CompoundRule>
      </Configuration>
@@ -6472,7 +6472,7 @@
              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>
              <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>
              <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Excludes" Value="UsbAccessory"/>
              <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceSpeaker"/>
              <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceSpeaker"/>
            </CompoundRule>
          </CompoundRule>
          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="UsbDevice"/>
@@ -8416,6 +8416,7 @@
      <ConfigurableElement Path="/Policy/policy/usages/assistance_navigation_guidance/applicable_strategy/strategy"/>
      <ConfigurableElement Path="/Policy/policy/usages/assistance_sonification/applicable_strategy/strategy"/>
      <ConfigurableElement Path="/Policy/policy/usages/game/applicable_strategy/strategy"/>
      <ConfigurableElement Path="/Policy/policy/usages/assistant/applicable_strategy/strategy"/>
    </ConfigurableElements>
    <Settings>
      <Configuration Name="Calibration">
@@ -8461,6 +8462,9 @@
        <ConfigurableElement Path="/Policy/policy/usages/game/applicable_strategy/strategy">
          <EnumParameter Name="strategy">media</EnumParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/usages/assistant/applicable_strategy/strategy">
          <EnumParameter Name="strategy">media</EnumParameter>
        </ConfigurableElement>
      </Configuration>
    </Settings>
  </ConfigurableDomain>
@@ -8738,6 +8742,7 @@
      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/loopback"/>
      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/ip"/>
      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bus"/>
      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/stub"/>
    </ConfigurableElements>
    <Settings>
      <Configuration Name="Calibration">
@@ -9428,6 +9433,9 @@
        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bus">
          <BitParameter Name="bus">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/stub">
          <BitParameter Name="stub">0</BitParameter>
        </ConfigurableElement>
      </Configuration>
    </Settings>
  </ConfigurableDomain>
@@ -9758,7 +9766,7 @@
      </Configuration>
    </Settings>
  </ConfigurableDomain>
  <ConfigurableDomain Name="DeviceForInputSource.VoiceRecognitionAndHotword" SequenceAware="false">
  <ConfigurableDomain Name="DeviceForInputSource.VoiceRecognitionAndUnprocessedAndHotword" SequenceAware="false">
    <Configurations>
      <Configuration Name="ScoHeadset">
        <CompoundRule Type="All">
@@ -9790,6 +9798,10 @@
      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/wired_headset"/>
      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/usb_device"/>
      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic"/>
      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bluetooth_sco_headset"/>
      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/wired_headset"/>
      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/usb_device"/>
      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/builtin_mic"/>
      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset"/>
      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/wired_headset"/>
      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/usb_device"/>
@@ -9809,6 +9821,18 @@
        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
          <BitParameter Name="builtin_mic">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bluetooth_sco_headset">
          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/wired_headset">
          <BitParameter Name="wired_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/usb_device">
          <BitParameter Name="usb_device">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/builtin_mic">
          <BitParameter Name="builtin_mic">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
          <BitParameter Name="bluetooth_sco_headset">1</BitParameter>
        </ConfigurableElement>
@@ -9835,6 +9859,18 @@
        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
          <BitParameter Name="builtin_mic">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bluetooth_sco_headset">
          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/wired_headset">
          <BitParameter Name="wired_headset">1</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/usb_device">
          <BitParameter Name="usb_device">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/builtin_mic">
          <BitParameter Name="builtin_mic">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
        </ConfigurableElement>
@@ -9861,6 +9897,18 @@
        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
          <BitParameter Name="builtin_mic">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bluetooth_sco_headset">
          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/wired_headset">
          <BitParameter Name="wired_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/usb_device">
          <BitParameter Name="usb_device">1</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/builtin_mic">
          <BitParameter Name="builtin_mic">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
        </ConfigurableElement>
@@ -9887,6 +9935,18 @@
        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
          <BitParameter Name="builtin_mic">1</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bluetooth_sco_headset">
          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/wired_headset">
          <BitParameter Name="wired_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/usb_device">
          <BitParameter Name="usb_device">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/builtin_mic">
          <BitParameter Name="builtin_mic">1</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
        </ConfigurableElement>
@@ -9913,6 +9973,18 @@
        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/builtin_mic">
          <BitParameter Name="builtin_mic">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bluetooth_sco_headset">
          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/wired_headset">
          <BitParameter Name="wired_headset">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/usb_device">
          <BitParameter Name="usb_device">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/builtin_mic">
          <BitParameter Name="builtin_mic">0</BitParameter>
        </ConfigurableElement>
        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_sco_headset">
          <BitParameter Name="bluetooth_sco_headset">0</BitParameter>
        </ConfigurableElement>
+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ supDomain: DeviceForStrategy
						TelephonyMode IsNot InCall
						TelephonyMode IsNot InCommunication
						AvailableOutputDevices Excludes UsbAccessory
						ForceUseForCommunication Is ForceSpeaker
						ForceUseForMedia IsNot ForceSpeaker
				AvailableOutputDevices Includes UsbDevice

				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask
+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ domainGroup: DeviceForStrategy
				#
				TelephonyMode IsNot InCall
				TelephonyMode IsNot InCommunication
				ForceUseForMedia Is ForceNoBtA2dp
				ForceUseForMedia IsNot ForceNoBtA2dp
				AvailableOutputDevices Includes BluetoothA2dp

				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
@@ -105,7 +105,7 @@ domainGroup: DeviceForStrategy
				#
				TelephonyMode IsNot InCall
				TelephonyMode IsNot InCommunication
				ForceUseForMedia Is ForceNoBtA2dp
				ForceUseForMedia IsNot ForceNoBtA2dp
				AvailableOutputDevices Includes BluetoothA2dpHeadphones

				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
@@ -132,7 +132,7 @@ domainGroup: DeviceForStrategy
				#
				TelephonyMode IsNot InCall
				TelephonyMode IsNot InCommunication
				ForceUseForMedia Is ForceNoBtA2dp
				ForceUseForMedia IsNot ForceNoBtA2dp
				AvailableOutputDevices Includes BluetoothA2dpSpeaker

				component: /Policy/policy/strategies/sonification_respectful/selected_output_devices/mask
+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ supDomain: SelectedStrategyForUsages
			/Policy/policy/usages/assistance_navigation_guidance/applicable_strategy/strategy = media
			/Policy/policy/usages/assistance_sonification/applicable_strategy/strategy = media
			/Policy/policy/usages/game/applicable_strategy/strategy = media
			/Policy/policy/usages/assistant/applicable_strategy/strategy = media

	domain: AssistanceAccessibility
		conf: Sonification
+2 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@

        <!--#################### USAGE BEGIN ####################-->

        <ComponentType Name="Usages" Description="associated to audio_stream_type_t definition,
        <ComponentType Name="Usages" Description="associated to audio_usage_t definition,
                             identifier mapping must match the value of the enum">
            <Component Name="unknown" Type="Usage" Mapping="Amend1:Unknown,Identifier:0"/>
            <Component Name="media" Type="Usage" Mapping="Amend1:Media,Identifier:1"/>
@@ -97,6 +97,7 @@
            <Component Name="game" Type="Usage" Mapping="Amend1:BluetoothSco,Identifier:14"/>
            <Component Name="virtual_source" Type="Usage"
                                             Mapping="Amend1:VirtualSource,Identifier:15"/>
            <Component Name="assistant" Type="Usage" Mapping="Amend1:Assistant,Identifier:16"/>
        </ComponentType>

        <!--#################### USAGE END ####################-->