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

Commit d1111dd6 authored by Michal Olech's avatar Michal Olech Committed by Automerger Merge Worker
Browse files

Merge changes from topic "CecConfigRRO" into sc-dev am: f4f6a9eb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13687968

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I203954cee79086e617b1f542167a440084acbca0
parents aa94a026 f4f6a9eb

Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -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",

core/res/res/values/config.xml

+93 −0
Original line number Diff line number Diff line
@@ -4722,4 +4722,97 @@ 


    <!-- Whether to allow the caching of the SIM PIN for verification after unattended reboot -->

    <bool name="config_allow_pin_storage_for_unattended_reboot">true</bool>



    <!-- CEC Configuration -->

    <bool name="config_cecHdmiCecEnabled_userConfigurable">true</bool>

    <bool name="config_cecHdmiCecControlEnabled_allowed">true</bool>

    <bool name="config_cecHdmiCecControlEnabled_default">true</bool>

    <bool name="config_cecHdmiCecControlDisabled_allowed">true</bool>

    <bool name="config_cecHdmiCecControlDisabled_default">false</bool>



    <bool name="config_cecHdmiCecVersion_userConfigurable">true</bool>

    <bool name="config_cecHdmiCecVersion14b_allowed">true</bool>

    <bool name="config_cecHdmiCecVersion14b_default">true</bool>

    <bool name="config_cecHdmiCecVersion20_allowed">true</bool>

    <bool name="config_cecHdmiCecVersion20_default">false</bool>



    <bool name="config_cecSendStandbyOnSleep_userConfigurable">true</bool>

    <bool name="config_cecPowerControlModeTv_allowed">true</bool>

    <bool name="config_cecPowerControlModeTv_default">true</bool>

    <bool name="config_cecPowerControlModeBroadcast_allowed">true</bool>

    <bool name="config_cecPowerControlModeBroadcast_default">false</bool>

    <bool name="config_cecPowerControlModeNone_allowed">true</bool>

    <bool name="config_cecPowerControlModeNone_default">false</bool>



    <bool name="config_cecPowerStateChangeOnActiveSourceLost_userConfigurable">true</bool>

    <bool name="config_cecPowerStateChangeOnActiveSourceLostNone_allowed">true</bool>

    <bool name="config_cecPowerStateChangeOnActiveSourceLostNone_default">true</bool>

    <bool name="config_cecPowerStateChangeOnActiveSourceLostStandbyNow_allowed">true</bool>

    <bool name="config_cecPowerStateChangeOnActiveSourceLostStandbyNow_default">false</bool>



    <bool name="config_cecSystemAudioModeMuting_userConfigurable">true</bool>

    <bool name="config_cecSystemAudioModeMutingEnabled_allowed">true</bool>

    <bool name="config_cecSystemAudioModeMutingEnabled_default">true</bool>

    <bool name="config_cecSystemAudioModeMutingDisabled_allowed">true</bool>

    <bool name="config_cecSystemAudioModeMutingDisabled_default">false</bool>



    <bool name="config_cecVolumeControlMode_userConfigurable">true</bool>

    <bool name="config_cecVolumeControlModeEnabled_allowed">true</bool>

    <bool name="config_cecVolumeControlModeEnabled_default">true</bool>

    <bool name="config_cecVolumeControlModeDisabled_allowed">true</bool>

    <bool name="config_cecVolumeControlModeDisabled_default">false</bool>



    <bool name="config_cecTvWakeOnOneTouchPlay_userConfigurable">true</bool>

    <bool name="config_cecTvWakeOnOneTouchPlayEnabled_allowed">true</bool>

    <bool name="config_cecTvWakeOnOneTouchPlayEnabled_default">true</bool>

    <bool name="config_cecTvWakeOnOneTouchPlayDisabled_allowed">true</bool>

    <bool name="config_cecTvWakeOnOneTouchPlayDisabled_default">false</bool>



    <bool name="config_cecTvSendStandbyOnSleep_userConfigurable">true</bool>

    <bool name="config_cecTvSendStandbyOnSleepEnabled_allowed">true</bool>

    <bool name="config_cecTvSendStandbyOnSleepEnabled_default">true</bool>

    <bool name="config_cecTvSendStandbyOnSleepDisabled_allowed">true</bool>

    <bool name="config_cecTvSendStandbyOnSleepDisabled_default">false</bool>



    <bool name="config_cecRcProfileTv_userConfigurable">true</bool>

    <bool name="config_cecRcProfileTvNone_allowed">true</bool>

    <bool name="config_cecRcProfileTvNone_default">true</bool>

    <bool name="config_cecRcProfileTvOne_allowed">true</bool>

    <bool name="config_cecRcProfileTvOne_default">false</bool>

    <bool name="config_cecRcProfileTvTwo_allowed">true</bool>

    <bool name="config_cecRcProfileTvTwo_default">false</bool>

    <bool name="config_cecRcProfileTvThree_allowed">true</bool>

    <bool name="config_cecRcProfileTvThree_default">false</bool>

    <bool name="config_cecRcProfileTvFour_allowed">true</bool>

    <bool name="config_cecRcProfileTvFour_default">false</bool>



    <bool name="config_cecRcProfileSourceRootMenu_userConfigurable">true</bool>

    <bool name="config_cecRcProfileSourceRootMenuHandled_allowed">true</bool>

    <bool name="config_cecRcProfileSourceRootMenuHandled_default">true</bool>

    <bool name="config_cecRcProfileSourceRootMenuNotHandled_allowed">true</bool>

    <bool name="config_cecRcProfileSourceRootMenuNotHandled_default">false</bool>



    <bool name="config_cecRcProfileSourceSetupMenu_userConfigurable">true</bool>

    <bool name="config_cecRcProfileSourceSetupMenuHandled_allowed">true</bool>

    <bool name="config_cecRcProfileSourceSetupMenuHandled_default">true</bool>

    <bool name="config_cecRcProfileSourceSetupMenuNotHandled_allowed">true</bool>

    <bool name="config_cecRcProfileSourceSetupMenuNotHandled_default">false</bool>



    <bool name="config_cecRcProfileSourceContentsMenu_userConfigurable">true</bool>

    <bool name="config_cecRcProfileSourceContentsMenuHandled_allowed">true</bool>

    <bool name="config_cecRcProfileSourceContentsMenuHandled_default">false</bool>

    <bool name="config_cecRcProfileSourceContentsMenuNotHandled_allowed">true</bool>

    <bool name="config_cecRcProfileSourceContentsMenuNotHandled_default">true</bool>



    <bool name="config_cecRcProfileSourceTopMenu_userConfigurable">true</bool>

    <bool name="config_cecRcProfileSourceTopMenuHandled_allowed">true</bool>

    <bool name="config_cecRcProfileSourceTopMenuHandled_default">false</bool>

    <bool name="config_cecRcProfileSourceTopMenuNotHandled_allowed">true</bool>

    <bool name="config_cecRcProfileSourceTopMenuNotHandled_default">true</bool>



    <bool name="config_cecRcProfileSourceMediaContextSensitiveMenu_userConfigurable">true</bool>

    <bool name="config_cecRcProfileSourceMediaContextSensitiveMenuHandled_allowed">true</bool>

    <bool name="config_cecRcProfileSourceMediaContextSensitiveMenuHandled_default">false</bool>

    <bool name="config_cecRcProfileSourceMediaContextSensitiveMenuNotHandled_allowed">true</bool>

    <bool name="config_cecRcProfileSourceMediaContextSensitiveMenuNotHandled_default">true</bool>

</resources>

core/res/res/values/symbols.xml

+93 −0
Original line number Diff line number Diff line
@@ -4224,4 +4224,97 @@ 
  <java-symbol type="bool" name="config_voice_data_sms_auto_fallback" />



  <java-symbol type="bool" name="config_enableOneHandedKeyguard" />



  <!-- CEC Configuration -->

  <java-symbol type="bool" name="config_cecHdmiCecEnabled_userConfigurable" />

  <java-symbol type="bool" name="config_cecHdmiCecControlEnabled_allowed" />

  <java-symbol type="bool" name="config_cecHdmiCecControlEnabled_default" />

  <java-symbol type="bool" name="config_cecHdmiCecControlDisabled_allowed" />

  <java-symbol type="bool" name="config_cecHdmiCecControlDisabled_default" />



  <java-symbol type="bool" name="config_cecHdmiCecVersion_userConfigurable" />

  <java-symbol type="bool" name="config_cecHdmiCecVersion14b_allowed" />

  <java-symbol type="bool" name="config_cecHdmiCecVersion14b_default" />

  <java-symbol type="bool" name="config_cecHdmiCecVersion20_allowed" />

  <java-symbol type="bool" name="config_cecHdmiCecVersion20_default" />



  <java-symbol type="bool" name="config_cecSendStandbyOnSleep_userConfigurable" />

  <java-symbol type="bool" name="config_cecPowerControlModeTv_allowed" />

  <java-symbol type="bool" name="config_cecPowerControlModeTv_default" />

  <java-symbol type="bool" name="config_cecPowerControlModeBroadcast_allowed" />

  <java-symbol type="bool" name="config_cecPowerControlModeBroadcast_default" />

  <java-symbol type="bool" name="config_cecPowerControlModeNone_allowed" />

  <java-symbol type="bool" name="config_cecPowerControlModeNone_default" />



  <java-symbol type="bool" name="config_cecPowerStateChangeOnActiveSourceLost_userConfigurable" />

  <java-symbol type="bool" name="config_cecPowerStateChangeOnActiveSourceLostNone_allowed" />

  <java-symbol type="bool" name="config_cecPowerStateChangeOnActiveSourceLostNone_default" />

  <java-symbol type="bool" name="config_cecPowerStateChangeOnActiveSourceLostStandbyNow_allowed" />

  <java-symbol type="bool" name="config_cecPowerStateChangeOnActiveSourceLostStandbyNow_default" />



  <java-symbol type="bool" name="config_cecSystemAudioModeMuting_userConfigurable" />

  <java-symbol type="bool" name="config_cecSystemAudioModeMutingEnabled_allowed" />

  <java-symbol type="bool" name="config_cecSystemAudioModeMutingEnabled_default" />

  <java-symbol type="bool" name="config_cecSystemAudioModeMutingDisabled_allowed" />

  <java-symbol type="bool" name="config_cecSystemAudioModeMutingDisabled_default" />



  <java-symbol type="bool" name="config_cecVolumeControlMode_userConfigurable" />

  <java-symbol type="bool" name="config_cecVolumeControlModeEnabled_allowed" />

  <java-symbol type="bool" name="config_cecVolumeControlModeEnabled_default" />

  <java-symbol type="bool" name="config_cecVolumeControlModeDisabled_allowed" />

  <java-symbol type="bool" name="config_cecVolumeControlModeDisabled_default" />



  <java-symbol type="bool" name="config_cecTvWakeOnOneTouchPlay_userConfigurable" />

  <java-symbol type="bool" name="config_cecTvWakeOnOneTouchPlayEnabled_allowed" />

  <java-symbol type="bool" name="config_cecTvWakeOnOneTouchPlayEnabled_default" />

  <java-symbol type="bool" name="config_cecTvWakeOnOneTouchPlayDisabled_allowed" />

  <java-symbol type="bool" name="config_cecTvWakeOnOneTouchPlayDisabled_default" />



  <java-symbol type="bool" name="config_cecTvSendStandbyOnSleep_userConfigurable" />

  <java-symbol type="bool" name="config_cecTvSendStandbyOnSleepEnabled_allowed" />

  <java-symbol type="bool" name="config_cecTvSendStandbyOnSleepEnabled_default" />

  <java-symbol type="bool" name="config_cecTvSendStandbyOnSleepDisabled_allowed" />

  <java-symbol type="bool" name="config_cecTvSendStandbyOnSleepDisabled_default" />



  <java-symbol type="bool" name="config_cecRcProfileTv_userConfigurable" />

  <java-symbol type="bool" name="config_cecRcProfileTvNone_allowed" />

  <java-symbol type="bool" name="config_cecRcProfileTvNone_default" />

  <java-symbol type="bool" name="config_cecRcProfileTvOne_allowed" />

  <java-symbol type="bool" name="config_cecRcProfileTvOne_default" />

  <java-symbol type="bool" name="config_cecRcProfileTvTwo_allowed" />

  <java-symbol type="bool" name="config_cecRcProfileTvTwo_default" />

  <java-symbol type="bool" name="config_cecRcProfileTvThree_allowed" />

  <java-symbol type="bool" name="config_cecRcProfileTvThree_default" />

  <java-symbol type="bool" name="config_cecRcProfileTvFour_allowed" />

  <java-symbol type="bool" name="config_cecRcProfileTvFour_default" />



  <java-symbol type="bool" name="config_cecRcProfileSourceRootMenu_userConfigurable" />

  <java-symbol type="bool" name="config_cecRcProfileSourceRootMenuHandled_allowed" />

  <java-symbol type="bool" name="config_cecRcProfileSourceRootMenuHandled_default" />

  <java-symbol type="bool" name="config_cecRcProfileSourceRootMenuNotHandled_allowed" />

  <java-symbol type="bool" name="config_cecRcProfileSourceRootMenuNotHandled_default" />



  <java-symbol type="bool" name="config_cecRcProfileSourceSetupMenu_userConfigurable" />

  <java-symbol type="bool" name="config_cecRcProfileSourceSetupMenuHandled_allowed" />

  <java-symbol type="bool" name="config_cecRcProfileSourceSetupMenuHandled_default" />

  <java-symbol type="bool" name="config_cecRcProfileSourceSetupMenuNotHandled_allowed" />

  <java-symbol type="bool" name="config_cecRcProfileSourceSetupMenuNotHandled_default" />



  <java-symbol type="bool" name="config_cecRcProfileSourceContentsMenu_userConfigurable" />

  <java-symbol type="bool" name="config_cecRcProfileSourceContentsMenuHandled_allowed" />

  <java-symbol type="bool" name="config_cecRcProfileSourceContentsMenuHandled_default" />

  <java-symbol type="bool" name="config_cecRcProfileSourceContentsMenuNotHandled_allowed" />

  <java-symbol type="bool" name="config_cecRcProfileSourceContentsMenuNotHandled_default" />



  <java-symbol type="bool" name="config_cecRcProfileSourceTopMenu_userConfigurable" />

  <java-symbol type="bool" name="config_cecRcProfileSourceTopMenuHandled_allowed" />

  <java-symbol type="bool" name="config_cecRcProfileSourceTopMenuHandled_default" />

  <java-symbol type="bool" name="config_cecRcProfileSourceTopMenuNotHandled_allowed" />

  <java-symbol type="bool" name="config_cecRcProfileSourceTopMenuNotHandled_default" />



  <java-symbol type="bool" name="config_cecRcProfileSourceMediaContextSensitiveMenu_userConfigurable" />

  <java-symbol type="bool" name="config_cecRcProfileSourceMediaContextSensitiveMenuHandled_allowed" />

  <java-symbol type="bool" name="config_cecRcProfileSourceMediaContextSensitiveMenuHandled_default" />

  <java-symbol type="bool" name="config_cecRcProfileSourceMediaContextSensitiveMenuNotHandled_allowed" />

  <java-symbol type="bool" name="config_cecRcProfileSourceMediaContextSensitiveMenuNotHandled_default" />

</resources>

services/core/Android.bp

+0 −7
Original line number Diff line number Diff line
@@ -107,7 +107,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",
@@ -128,7 +127,6 @@ java_library_static { 
    ],



    required: [

        "cec_config.xml",

        "gps_debug.conf",

        "protolog.conf.json.gz",

    ],
@@ -193,11 +191,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",