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

Commit c3ddf207 authored by Weilin Xu's avatar Weilin Xu Committed by Automerger Merge Worker
Browse files

Merge "Fixed oem traffic announcement typo in framework example" into main am:... 

Merge "Fixed oem traffic announcement typo in framework example" into main am: 31a6a7c0 am: 2f75d16d

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



Change-Id: I5aed494af0ab55c471bb5c5e03d6ed625a27207b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 53277d0c 2f75d16d

services/audiopolicy/engineconfigurable/config/example/automotive/audio_policy_engine_product_strategies.xml

+3 −3
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ limitations under the License. 
    ( type == 1 ) )

    -->



    <ProductStrategy name="oem_traffic_anouncement">

        <AttributesGroup volumeGroup="oem_traffic_anouncement">

    <ProductStrategy name="oem_traffic_announcement">

        <AttributesGroup volumeGroup="oem_traffic_announcement">

            <ContentType value="AUDIO_CONTENT_TYPE_SPEECH"/>

            <Usage value="AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE"/>

            <!--  traffic_annoucement = 1 -->

            <!--  traffic_announcement = 1 -->

            <Bundle key="oem" value="1"/>

        </AttributesGroup>

    </ProductStrategy>

services/audiopolicy/engineconfigurable/config/example/automotive/audio_policy_engine_volumes.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


<volumeGroups>

    <volumeGroup>

        <name>oem_traffic_anouncement</name>

        <name>oem_traffic_announcement</name>

        <indexMin>0</indexMin>

        <indexMax>40</indexMax>

        <volume deviceCategory="DEVICE_CATEGORY_SPEAKER">

services/audiopolicy/engineconfigurable/config/example/caremu/audio_policy_engine_product_strategies.xml

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ limitations under the License. 
<ProductStrategies>

    <!-- OEM Usages -->

    <!-- product_strategy will be defined according this order

    product_strategy is oem_traffic_anouncement if all the conditions are satisfied for

    product_strategy is oem_traffic_announcement if all the conditions are satisfied for

    AudioAttributes aa



    int type = 0;
@@ -30,8 +30,8 @@ limitations under the License. 
    ( type == 1 ) )

    -->



    <ProductStrategy name="oem_traffic_anouncement">

        <AttributesGroup volumeGroup="oem_traffic_anouncement">

    <ProductStrategy name="oem_traffic_announcement">

        <AttributesGroup volumeGroup="oem_traffic_announcement">

            <ContentType value="AUDIO_CONTENT_TYPE_SPEECH"/>

            <Usage value="AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE"/>

            <!--  traffic_annoucement = 1 -->

services/audiopolicy/engineconfigurable/config/example/caremu/audio_policy_engine_volumes.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


<volumeGroups>

    <volumeGroup>

        <name>oem_traffic_anouncement</name>

        <name>oem_traffic_announcement</name>

        <indexMin>0</indexMin>

        <indexMax>40</indexMax>

        <volume deviceCategory="DEVICE_CATEGORY_SPEAKER">

services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Settings/device_for_product_strategies.pfw

+5 −5
Original line number Diff line number Diff line 
supDomain: DeviceForProductStrategies

	supDomain: OemTrafficAnouncement

	supDomain: OemTrafficAnnouncement

		domain: UnreachableDevices

			conf: calibration

				component: /Policy/policy/product_strategies/oem_traffic_anouncement/selected_output_devices/mask

				component: /Policy/policy/product_strategies/oem_traffic_announcement/selected_output_devices/mask

					earpiece = 0

					speaker = 0

					wired_headset = 0
@@ -30,18 +30,18 @@ supDomain: DeviceForProductStrategies 
					proxy = 0

					usb_headset = 0

					stub = 0

				/Policy/policy/product_strategies/oem_traffic_anouncement/device_address = BUS08_OEM1

				/Policy/policy/product_strategies/oem_traffic_announcement/device_address = BUS08_OEM1



		domain: SelectedDevice

			conf: Bus

				AvailableOutputDevices Includes Bus

				AvailableOutputDevicesAddresses Includes BUS08_OEM1



				component: /Policy/policy/product_strategies/oem_traffic_anouncement/selected_output_devices/mask

				component: /Policy/policy/product_strategies/oem_traffic_announcement/selected_output_devices/mask

					bus = 1



			conf: Default

				component: /Policy/policy/product_strategies/oem_traffic_anouncement/selected_output_devices/mask

				component: /Policy/policy/product_strategies/oem_traffic_announcement/selected_output_devices/mask

					bus = 0



	supDomain: OemStrategy1