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

Commit aa5bf3a3 authored by Michal Olech's avatar Michal Olech
Browse files

[CEC Configuration] Remove cec-config XSD and the main cec_config.xml 

Bug: 180316277
Bug: 166430550
Test: build; flash; run
Change-Id: I898324ee8c8339c95f72b7839bc68296830606e1
parent d56cef97

Android.bp

+1 −2
Original line number Original line Diff line number Diff line
@@ -665,9 +665,8 @@ java_defaults { 
    ],

    ],

    required: [

    required: [

        "framework-platform-compat-config",

        "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",

        "gps_debug.conf",

        "cec_config.xml",

        "icu4j-platform-compat-config",

        "icu4j-platform-compat-config",

        "libcore-platform-compat-config",

        "libcore-platform-compat-config",

        "protolog.conf.json.gz",

        "protolog.conf.json.gz",

services/core/Android.bp

+0 −7
Original line number Original line Diff line number Diff line
@@ -98,7 +98,6 @@ java_library_static { 
        ":platform-compat-overrides",

        ":platform-compat-overrides",

        ":display-device-config",

        ":display-device-config",

        ":display-layout-config",

        ":display-layout-config",

        ":cec-config",

        ":device-state-config",

        ":device-state-config",

        "java/com/android/server/EventLogTags.logtags",

        "java/com/android/server/EventLogTags.logtags",

        "java/com/android/server/am/EventLogTags.logtags",

        "java/com/android/server/am/EventLogTags.logtags",
@@ -119,7 +118,6 @@ java_library_static { 
    ],

    ],





    required: [

    required: [

        "cec_config.xml",

        "gps_debug.conf",

        "gps_debug.conf",

        "protolog.conf.json.gz",

        "protolog.conf.json.gz",

    ],

    ],
@@ -184,11 +182,6 @@ java_library_host { 
    srcs: ["java/com/android/server/notification/SmallHash.java"]

    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 {

prebuilt_etc {

    name: "gps_debug.conf",

    name: "gps_debug.conf",

    src: "java/com/android/server/location/gnss/gps_debug.conf",

    src: "java/com/android/server/location/gnss/gps_debug.conf",

services/core/java/com/android/server/hdmi/cec_config.xml

deleted100644 → 0
+0 −133
Original line number Original line Diff line number Diff line 
<?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>

services/core/xsd/Android.bp

+0 −7
Original line number Original line Diff line number Diff line
@@ -44,13 +44,6 @@ xsd_config { 
    package_name: "com.android.server.display.config.layout",

    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 {

xsd_config {

    name: "device-state-config",

    name: "device-state-config",

    srcs: ["device-state-config/device-state-config.xsd"],

    srcs: ["device-state-config/device-state-config.xsd"],

services/core/xsd/cec-config/cec-config.xsd

deleted100644 → 0
+0 −29
Original line number Original line Diff line number Diff line 
<?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>