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

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

[CEC Configuration] Use change listener from HdmiCecConfig 

Bug: 187284252
Test: build and smoke test

Change-Id: Ib53424809adf55c1969f235494eaf13cd230da25
parent 3d007e9c

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

+9 −5
Original line number Diff line number Diff line
@@ -639,6 +639,15 @@ public class HdmiControlService extends SystemService { 
                        }

                    }

                }, mServiceThreadExecutor);

        mHdmiCecConfig.registerChangeListener(

                HdmiControlManager.CEC_SETTING_NAME_VOLUME_CONTROL_MODE,

                new HdmiCecConfig.SettingChangeListener() {

                    @Override

                    public void onChange(String setting) {

                        setHdmiCecVolumeControlEnabledInternal(getHdmiCecConfig().getIntValue(

                                HdmiControlManager.CEC_SETTING_NAME_VOLUME_CONTROL_MODE));

                    }

                }, mServiceThreadExecutor);

        mHdmiCecConfig.registerChangeListener(

                HdmiControlManager.CEC_SETTING_NAME_TV_WAKE_ON_ONE_TOUCH_PLAY,

                new HdmiCecConfig.SettingChangeListener() {
@@ -778,7 +787,6 @@ public class HdmiControlService extends SystemService { 
    private void registerContentObserver() {

        ContentResolver resolver = getContext().getContentResolver();

        String[] settings = new String[] {

                Global.HDMI_CONTROL_VOLUME_CONTROL_ENABLED,

                Global.MHL_INPUT_SWITCHING_ENABLED,

                Global.MHL_POWER_CHARGE_ENABLED,

                Global.HDMI_CEC_SWITCH_ENABLED,
@@ -801,10 +809,6 @@ public class HdmiControlService extends SystemService { 
            String option = uri.getLastPathSegment();

            boolean enabled = readBooleanSetting(option, true);

            switch (option) {

                case Global.HDMI_CONTROL_VOLUME_CONTROL_ENABLED:

                    setHdmiCecVolumeControlEnabledInternal(getHdmiCecConfig().getIntValue(

                            HdmiControlManager.CEC_SETTING_NAME_VOLUME_CONTROL_MODE));

                    break;

                case Global.HDMI_CEC_SWITCH_ENABLED:

                    if (isAudioSystemDevice()) {

                        if (audioSystem() == null) {