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

Commit f483aae6 authored by Michal Olech's avatar Michal Olech Committed by Android (Google) Code Review
Browse files

Merge changes Ifb05b969,I74808d8e 

* changes:
  [CEC Configuration] Switch HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED to Shared Preferences
  [CEC Configuration] Switch HDMI_CEC_ENABLED to Shared Preferences
parents 93d23590 49ef8f2e

core/java/android/hardware/hdmi/HdmiControlManager.java

+2 −1
Original line number Diff line number Diff line
@@ -1422,7 +1422,8 @@ public final class HdmiControlManager { 
         * Called when HDMI Control (CEC) is enabled/disabled.

         *

         * @param isCecEnabled status of HDMI Control

         * {@link android.provider.Settings.Global#HDMI_CONTROL_ENABLED}: {@code true} if enabled.

         * {@link android.hardware.hdmi.HdmiControlManager#CEC_SETTING_NAME_HDMI_CEC_ENABLED}:

         * {@code HDMI_CEC_CONTROL_ENABLED} if enabled.

         * @param isCecAvailable status of CEC support of the connected display (the TV).

         * {@code true} if supported.

         *

core/java/android/provider/Settings.java

+0 −18
Original line number Diff line number Diff line
@@ -11049,24 +11049,6 @@ public final class Settings { 
        @Deprecated

        public static final String INSTALL_NON_MARKET_APPS = Secure.INSTALL_NON_MARKET_APPS;













        /**













        * Whether HDMI control shall be enabled. If disabled, no CEC/MHL command will be













        * sent or processed. (0 = false, 1 = true)













        * @hide













        */













        @Readable













        public static final String HDMI_CONTROL_ENABLED = "hdmi_control_enabled";

























        /**













         * Whether TV will also turn off other CEC devices when it goes to standby mode.













         * (0 = false, 1 = true)













         *













         * @hide













         */













        @Readable













        public static final String HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED =













                "hdmi_control_auto_device_off_enabled";



























        /**















         * Whether or not media is shown automatically when bypassing as a heads up.















         * @hide

































packages/SettingsProvider/res/values/defaults.xml



+0
−3




























Original line number
Diff line number
Diff line








@@ -242,9 +242,6 @@













    <!-- Default for Settings.Secure.AWARE_LOCK_ENABLED -->















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





























    <!-- Default for setting for Settings.Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED -->













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





























    <!-- Default for Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED -->















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

















































packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java



+0
−9




























Original line number
Diff line number
Diff line








@@ -800,15 +800,6 @@ class SettingsProtoDumpUtil {













                GlobalSettingsProto.Gpu.UPDATABLE_DRIVER_SPHAL_LIBRARIES);















        p.end(gpuToken);





























        final long hdmiToken = p.start(GlobalSettingsProto.HDMI);













        dumpSetting(s, p,













                Settings.Global.HDMI_CONTROL_ENABLED,













                GlobalSettingsProto.Hdmi.CONTROL_ENABLED);













        dumpSetting(s, p,













                Settings.Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED,













                GlobalSettingsProto.Hdmi.CONTROL_AUTO_DEVICE_OFF_ENABLED);













        p.end(hdmiToken);





























        dumpSetting(s, p,















                Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED,















                GlobalSettingsProto.HEADS_UP_NOTIFICATIONS_ENABLED);

































packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java



+1
−10




























Original line number
Diff line number
Diff line








@@ -4948,16 +4948,7 @@ public class SettingsProvider extends ContentProvider {





























                if (currentVersion == 190) {















                    // Version 190: get HDMI auto device off from overlay













                    final SettingsState globalSettings = getGlobalSettingsLocked();













                    final Setting currentSetting = globalSettings.getSettingLocked(













                            Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED);













                    if (currentSetting.isNull()) {













                        globalSettings.insertSettingLocked(













                                Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED,













                                getContext().getResources().getBoolean(













                                        R.bool.def_hdmiControlAutoDeviceOff) ? "1" : "0",













                                null, true, SettingsState.SYSTEM_PACKAGE_NAME);













                    }













                    // HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED settings option was removed















                    currentVersion = 191;















                }