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

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

Merge "[CEC Configuration] Fix missing listeners" into sc-dev am: e7dfae7e 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44310cb106febae8d13471f3b98bc7958c8a585e
parents b6f9c6e1 e7dfae7e

services/core/java/com/android/server/hdmi/HdmiCecConfig.java

+8 −0
Original line number Diff line number Diff line
@@ -411,6 +411,12 @@ public class HdmiCecConfig { 
            case Global.HDMI_CONTROL_VOLUME_CONTROL_ENABLED:

                notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_VOLUME_CONTROL_MODE);

                break;

            case Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED:

                notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY);

                break;

            case Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED:

                notifySettingChanged(HdmiControlManager.CEC_SETTING_NAME_TV_SEND_STANDBY_ON_SLEEP);

                break;

        }

    }
@@ -447,6 +453,8 @@ public class HdmiCecConfig { 
                Global.HDMI_CEC_VERSION,

                Global.HDMI_CONTROL_SEND_STANDBY_ON_SLEEP,

                Global.HDMI_CONTROL_VOLUME_CONTROL_ENABLED,

                Global.HDMI_CONTROL_AUTO_WAKEUP_ENABLED,

                Global.HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED,

        };

        for (String setting: settings) {

            resolver.registerContentObserver(Global.getUriFor(setting), false,