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

Commit b7b128f0 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

[AudioPolicy][EngineConfigurable] Prevent regression on audio-base.h change... 

[AudioPolicy][EngineConfigurable] Prevent regression on audio-base.h change am: 8b048921 am: 86324692

Change-Id: I3696d8197b8fb6cbd53331b6ddafadd13c20a16c
parents 3e7f2aca 86324692

services/audiopolicy/engineconfigurable/parameter-framework/Android.bp

+7 −3
Original line number Diff line number Diff line
@@ -31,9 +31,13 @@ prebuilt_etc { 
prebuilt_etc {

    name: "PolicySubsystem-CommonTypes.xml",

    vendor: true,

    src: ":PolicySubsystem-CommonTypes",

    src: ":buildcommontypesstructure_gen",

    sub_dir: "parameter-framework/Structure/Policy",

}

genrule {

    name: "buildcommontypesstructure_gen",

    defaults: ["buildcommontypesstructurerule"],

}



filegroup {

    name: "product_strategies_structure_template",
@@ -48,8 +52,8 @@ filegroup { 
    srcs: ["examples/common/Structure/PolicySubsystem-no-strategy.xml"],

}

filegroup {

    name: "PolicySubsystem-CommonTypes",

    srcs: ["examples/common/Structure/PolicySubsystem-CommonTypes.xml"],

    name: "common_types_structure_template",

    srcs: ["examples/common/Structure/PolicySubsystem-CommonTypes.xml.in"],

}

filegroup {

    name: "PolicyClass",

services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ filegroup { 
    srcs: [

        ":PolicyClass",

        ":PolicySubsystem",

        ":PolicySubsystem-CommonTypes",

        ":buildcommontypesstructure_gen",

        ":buildstrategiesstructure_gen",

    ],

}

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

+15 −15
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -59,7 +59,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -106,7 +106,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -152,7 +152,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -205,7 +205,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -251,7 +251,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -304,7 +304,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -357,7 +357,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -411,7 +411,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -464,7 +464,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -517,7 +517,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -570,7 +570,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -623,7 +623,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -676,7 +676,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -729,7 +729,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0

services/audiopolicy/engineconfigurable/parameter-framework/examples/CarEmu/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ filegroup { 
    srcs: [

        ":PolicyClass",

        ":PolicySubsystem",

        ":PolicySubsystem-CommonTypes",

        ":buildcommontypesstructure_gen",

        ":buildstrategiesstructure_gen",

    ],

}

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

+15 −15
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -59,7 +59,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -106,7 +106,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -153,7 +153,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -198,7 +198,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -245,7 +245,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -291,7 +291,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -337,7 +337,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -384,7 +384,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -430,7 +430,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -476,7 +476,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -522,7 +522,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -568,7 +568,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -614,7 +614,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0
@@ -659,7 +659,7 @@ supDomain: DeviceForProductStrategies 
					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					hdmi = 0

					angl_dock_headset = 0

					anlg_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0