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

Commit 77e672c7 authored by Amy's avatar Amy Committed by shubang
Browse files

Set routing feature enabled to default false and dump its status. 

ag/5408510

We set HDMI_CEC_SWITCH_ENABLED to default false to avoid switching
behavior at device set up stage. It should be set to true when device is
ready to switch.

Bug:116850696
Test: local tested
Change-Id: I3d08c9757c2a604294dae34103222e482088aec0
parent ec126a57

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

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
    protected HdmiCecLocalDeviceAudioSystem(HdmiControlService service) {

        super(service, HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);

        mRoutingControlFeatureEnabled =

            mService.readBooleanSetting(Global.HDMI_CEC_SWITCH_ENABLED, true);

            mService.readBooleanSetting(Global.HDMI_CEC_SWITCH_ENABLED, false);

        mSystemAudioControlFeatureEnabled =

            mService.readBooleanSetting(Global.HDMI_SYSTEM_AUDIO_CONTROL_ENABLED, true);

        // TODO(amyjojo): make the map ro property.
@@ -1119,6 +1119,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
        pw.println("HdmiCecLocalDeviceAudioSystem:");

        pw.increaseIndent();

        pw.println("mSystemAudioActivated: " + mSystemAudioActivated);

        pw.println("isRoutingFeatureEnabled " + isRoutingControlFeatureEnabled());

        pw.println("mSystemAudioControlFeatureEnabled: " + mSystemAudioControlFeatureEnabled);

        pw.println("mTvSystemAudioModeSupport: " + mTvSystemAudioModeSupport);

        pw.println("mArcEstablished: " + mArcEstablished);

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

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
    @LocalActivePort

    protected int mLocalActivePort = Constants.CEC_SWITCH_HOME;



    // Whether the Routing Coutrol feature is enabled or not. True by default.

    // Whether the Routing Coutrol feature is enabled or not. False by default.

    @GuardedBy("mLock")

    protected boolean mRoutingControlFeatureEnabled;