[CEC Configuration] Remove cec-config XSD and the main cec_config.xml
Bug: 180316277 Bug: 166430550 Test: build; flash; run Change-Id: I898324ee8c8339c95f72b7839bc68296830606e1
This commit is contained in:
Michal Olech
@@ -665,9 +665,8 @@ java_defaults {
|
||||
],
|
||||
required: [
|
||||
"framework-platform-compat-config",
|
||||
// TODO: remove gps_debug, cec_config.xml and protolog.conf.json when the build system propagates "required" properly.
|
||||
// TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly.
|
||||
"gps_debug.conf",
|
||||
"cec_config.xml",
|
||||
"icu4j-platform-compat-config",
|
||||
"libcore-platform-compat-config",
|
||||
"protolog.conf.json.gz",
|
||||
|
||||
@@ -98,7 +98,6 @@ java_library_static {
|
||||
":platform-compat-overrides",
|
||||
":display-device-config",
|
||||
":display-layout-config",
|
||||
":cec-config",
|
||||
":device-state-config",
|
||||
"java/com/android/server/EventLogTags.logtags",
|
||||
"java/com/android/server/am/EventLogTags.logtags",
|
||||
@@ -119,7 +118,6 @@ java_library_static {
|
||||
],
|
||||
|
||||
required: [
|
||||
"cec_config.xml",
|
||||
"gps_debug.conf",
|
||||
"protolog.conf.json.gz",
|
||||
],
|
||||
@@ -184,11 +182,6 @@ java_library_host {
|
||||
srcs: ["java/com/android/server/notification/SmallHash.java"]
|
||||
}
|
||||
|
||||
prebuilt_etc {
|
||||
name: "cec_config.xml",
|
||||
src: "java/com/android/server/hdmi/cec_config.xml",
|
||||
}
|
||||
|
||||
prebuilt_etc {
|
||||
name: "gps_debug.conf",
|
||||
src: "java/com/android/server/location/gnss/gps_debug.conf",
|
||||
|
||||
@@ -1,133 +0,0 @@
|
||||
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
|
||||
<cec-settings>
|
||||
<setting name="hdmi_cec_enabled"
|
||||
value-type="int"
|
||||
user-configurable="true">
|
||||
<allowed-values>
|
||||
<value int-value="0" />
|
||||
<value int-value="1" />
|
||||
</allowed-values>
|
||||
<default-value int-value="1" />
|
||||
</setting>
|
||||
<setting name="hdmi_cec_version"
|
||||
value-type="int"
|
||||
user-configurable="true">
|
||||
<allowed-values>
|
||||
<value int-value="0x05" />
|
||||
<value int-value="0x06" />
|
||||
</allowed-values>
|
||||
<default-value int-value="0x05" />
|
||||
</setting>
|
||||
<setting name="send_standby_on_sleep"
|
||||
value-type="string"
|
||||
user-configurable="true">
|
||||
<allowed-values>
|
||||
<value string-value="to_tv" />
|
||||
<value string-value="broadcast" />
|
||||
<value string-value="none" />
|
||||
</allowed-values>
|
||||
<default-value string-value="to_tv" />
|
||||
</setting>
|
||||
<setting name="power_state_change_on_active_source_lost"
|
||||
value-type="string"
|
||||
user-configurable="true">
|
||||
<allowed-values>
|
||||
<value string-value="none" />
|
||||
<value string-value="standby_now" />
|
||||
</allowed-values>
|
||||
<default-value string-value="none" />
|
||||
</setting>
|
||||
<setting name="system_audio_mode_muting"
|
||||
value-type="int"
|
||||
user-configurable="true">
|
||||
<allowed-values>
|
||||
<value int-value="0" />
|
||||
<value int-value="1" />
|
||||
</allowed-values>
|
||||
<default-value int-value="1" />
|
||||
</setting>
|
||||
<setting name="volume_control_enabled"
|
||||
value-type="int"
|
||||
user-configurable="true">
|
||||
<allowed-values>
|
||||
<value int-value="0" />
|
||||
<value int-value="1" />
|
||||
</allowed-values>
|
||||
<default-value int-value="1" />
|
||||
</setting>
|
||||
<setting name="tv_wake_on_one_touch_play"
|
||||
value-type="int"
|
||||
user-configurable="true">
|
||||
<allowed-values>
|
||||
<value int-value="0" />
|
||||
<value int-value="1" />
|
||||
</allowed-values>
|
||||
<default-value int-value="1" />
|
||||
</setting>
|
||||
<setting name="tv_send_standby_on_sleep"
|
||||
value-type="int"
|
||||
user-configurable="true">
|
||||
<allowed-values>
|
||||
<value int-value="0" />
|
||||
<value int-value="1" />
|
||||
</allowed-values>
|
||||
<default-value int-value="1" />
|
||||
</setting>
|
||||
<setting name="rc_profile_tv"
|
||||
value-type="int"
|
||||
user-configurable="false">
|
||||
<allowed-values>
|
||||
<value int-value="0x0" />
|
||||
<value int-value="0x2" />
|
||||
<value int-value="0x6" />
|
||||
<value int-value="0xA" />
|
||||
<value int-value="0xE" />
|
||||
</allowed-values>
|
||||
<default-value int-value="0x0" />
|
||||
</setting>
|
||||
<setting name="rc_profile_source_handles_root_menu"
|
||||
value-type="int"
|
||||
user-configurable="false">
|
||||
<allowed-values>
|
||||
<value int-value="0" />
|
||||
<value int-value="1" />
|
||||
</allowed-values>
|
||||
<default-value int-value="1" />
|
||||
</setting>
|
||||
<setting name="rc_profile_source_handles_setup_menu"
|
||||
value-type="int"
|
||||
user-configurable="false">
|
||||
<allowed-values>
|
||||
<value int-value="0" />
|
||||
<value int-value="1" />
|
||||
</allowed-values>
|
||||
<default-value int-value="1" />
|
||||
</setting>
|
||||
<setting name="rc_profile_source_handles_contents_menu"
|
||||
value-type="int"
|
||||
user-configurable="false">
|
||||
<allowed-values>
|
||||
<value int-value="0" />
|
||||
<value int-value="1" />
|
||||
</allowed-values>
|
||||
<default-value int-value="0" />
|
||||
</setting>
|
||||
<setting name="rc_profile_source_handles_top_menu"
|
||||
value-type="int"
|
||||
user-configurable="false">
|
||||
<allowed-values>
|
||||
<value int-value="0" />
|
||||
<value int-value="1" />
|
||||
</allowed-values>
|
||||
<default-value int-value="0" />
|
||||
</setting>
|
||||
<setting name="rc_profile_source_handles_media_context_sensitive_menu"
|
||||
value-type="int"
|
||||
user-configurable="false">
|
||||
<allowed-values>
|
||||
<value int-value="0" />
|
||||
<value int-value="1" />
|
||||
</allowed-values>
|
||||
<default-value int-value="0" />
|
||||
</setting>
|
||||
</cec-settings>
|
||||
@@ -44,13 +44,6 @@ xsd_config {
|
||||
package_name: "com.android.server.display.config.layout",
|
||||
}
|
||||
|
||||
xsd_config {
|
||||
name: "cec-config",
|
||||
srcs: ["cec-config/cec-config.xsd"],
|
||||
api_dir: "cec-config/schema",
|
||||
package_name: "com.android.server.hdmi.cec.config",
|
||||
}
|
||||
|
||||
xsd_config {
|
||||
name: "device-state-config",
|
||||
srcs: ["device-state-config/device-state-config.xsd"],
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xs:schema version="2.0"
|
||||
elementFormDefault="qualified"
|
||||
attributeFormDefault="unqualified"
|
||||
xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
||||
<xs:element name="cec-settings">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="setting" type="setting" minOccurs="0" maxOccurs="unbounded"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:complexType name="setting">
|
||||
<xs:attribute name="name" type="xs:string"/>
|
||||
<xs:attribute name="value-type" type="xs:string"/>
|
||||
<xs:attribute name="user-configurable" type="xs:boolean"/>
|
||||
<xs:element name="allowed-values" type="value-list" minOccurs="1" maxOccurs="1"/>
|
||||
<xs:element name="default-value" type="value" minOccurs="1" maxOccurs="1"/>
|
||||
</xs:complexType>
|
||||
<xs:complexType name="value-list">
|
||||
<xs:sequence>
|
||||
<xs:element name="value" type="value" minOccurs="1" maxOccurs="unbounded"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
<xs:complexType name="value">
|
||||
<xs:attribute name="string-value" type="xs:string"/>
|
||||
<xs:attribute name="int-value" type="xs:string"/>
|
||||
</xs:complexType>
|
||||
</xs:schema>
|
||||
@@ -1,44 +0,0 @@
|
||||
// Signature format: 2.0
|
||||
package com.android.server.hdmi.cec.config {
|
||||
|
||||
public class CecSettings {
|
||||
ctor public CecSettings();
|
||||
method public java.util.List<com.android.server.hdmi.cec.config.Setting> getSetting();
|
||||
}
|
||||
|
||||
public class Setting {
|
||||
ctor public Setting();
|
||||
method public com.android.server.hdmi.cec.config.ValueList getAllowedValues();
|
||||
method public com.android.server.hdmi.cec.config.Value getDefaultValue();
|
||||
method public String getName();
|
||||
method public boolean getUserConfigurable();
|
||||
method public String getValueType();
|
||||
method public void setAllowedValues(com.android.server.hdmi.cec.config.ValueList);
|
||||
method public void setDefaultValue(com.android.server.hdmi.cec.config.Value);
|
||||
method public void setName(String);
|
||||
method public void setUserConfigurable(boolean);
|
||||
method public void setValueType(String);
|
||||
}
|
||||
|
||||
public class Value {
|
||||
ctor public Value();
|
||||
method public String getIntValue();
|
||||
method public String getStringValue();
|
||||
method public void setIntValue(String);
|
||||
method public void setStringValue(String);
|
||||
}
|
||||
|
||||
public class ValueList {
|
||||
ctor public ValueList();
|
||||
method public java.util.List<com.android.server.hdmi.cec.config.Value> getValue();
|
||||
}
|
||||
|
||||
public class XmlParser {
|
||||
ctor public XmlParser();
|
||||
method public static com.android.server.hdmi.cec.config.CecSettings read(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
|
||||
method public static String readText(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
|
||||
method public static void skip(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
// Signature format: 2.0
|
||||
Reference in New Issue
Block a user