Merge "audio: Fix audio effects schema for V6" am: 6918c455e1 am: aef1ef555c

Change-Id: I52c0a714f9fbfcbfe89d84154745f42968ca73e7
This commit is contained in:
Automerger Merge Worker
2020-02-07 18:54:58 +00:00
2 changed files with 7 additions and 5 deletions

View File

@@ -34,6 +34,10 @@ package audio.effects.V6_0 {
public class DeviceProcessType extends audio.effects.V6_0.StreamProcessingType { public class DeviceProcessType extends audio.effects.V6_0.StreamProcessingType {
ctor public DeviceProcessType(); ctor public DeviceProcessType();
method public String getAddress();
method public audio.effects.V6_0.DeviceType getType();
method public void setAddress(String);
method public void setType(audio.effects.V6_0.DeviceType);
} }
public enum DeviceType { public enum DeviceType {

View File

@@ -255,10 +255,8 @@
</xs:annotation> </xs:annotation>
<xs:complexContent> <xs:complexContent>
<xs:extension base="aec:streamProcessingType"> <xs:extension base="aec:streamProcessingType">
<xs:complexType> <xs:attribute name="address" type="xs:string" use="required"/>
<xs:attribute name="address" type="xs:string" use="required"/> <xs:attribute name="type" type="aec:deviceType" use="required"/>
<xs:attribute name="type" type="aec:deviceType" use="required"/>
</xs:complexType>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
@@ -322,4 +320,4 @@
<xs:field xpath="@effect"/> <xs:field xpath="@effect"/>
</xs:keyref> </xs:keyref>
</xs:element> </xs:element>
</xs:schema> </xs:schema>