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

Commit f0c438c3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "CLEANUP: remove mSystemAudioSource"

parents fdf49451 17b29348

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

+0 −3
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDevice { 
    @GuardedBy("mLock")

    private boolean mSystemAudioControlFeatureEnabled;



    protected Integer mSystemAudioSource;



    private boolean mTvSystemAudioModeSupport;



    protected HdmiCecLocalDeviceAudioSystem(HdmiControlService service) {
@@ -232,7 +230,6 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDevice { 
            return true;

        }



        mSystemAudioSource = systemAudioStatusOn ? message.getSource() : null;

        mService.sendCecCommand(

                HdmiCecMessageBuilder.buildSetSystemAudioMode(

                        mAddress, Constants.ADDR_BROADCAST, systemAudioStatusOn));

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

+2 −2
Original line number Diff line number Diff line
@@ -1732,7 +1732,7 @@ public class HdmiControlService extends SystemService { 
                        Slog.w(TAG, "audio system is not available");

                        return;

                    }

                    if (audioSystem().mSystemAudioSource == null) {

                    if (!audioSystem().isSystemAudioActivated()) {

                        Slog.w(TAG, "audio system is not in system audio mode");

                        return;

                    }
@@ -1741,7 +1741,7 @@ public class HdmiControlService extends SystemService { 
                    sendCecCommand(HdmiCecMessageBuilder

                            .buildReportAudioStatus(

                                    device.getDeviceInfo().getLogicalAddress(),

                                    audioSystem().mSystemAudioSource,

                                    Constants.ADDR_TV,

                                    scaledVolume,

                                    isMute));

                }