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

Commit 55ed64aa authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-23.0' into a16

parents f90724b9 55ec8d9c

services/core/java/com/android/server/audio/AudioService.java

+3 −1
Original line number Diff line number Diff line
@@ -12525,7 +12525,8 @@ public class AudioService extends IAudioService.Stub 
            synchronized (mHdmiClientLock) {

                if (mHdmiManager == null) return;

                boolean cecEnabled = isCecEnabled == HdmiControlManager.HDMI_CEC_CONTROL_ENABLED;

                updateHdmiCecSinkLocked(cecEnabled ? isCecAvailable : false);

                updateHdmiCecSinkLocked(cecEnabled && isCecAvailable

                        && mHdmiCecVolumeControlEnabled);

            }

        }

    };
@@ -12538,6 +12539,7 @@ public class AudioService extends IAudioService.Stub 
                if (mHdmiManager == null) return;

                mHdmiCecVolumeControlEnabled =

                        hdmiCecVolumeControl == HdmiControlManager.VOLUME_CONTROL_ENABLED;

                updateHdmiCecSinkLocked(mHdmiCecVolumeControlEnabled);

            }

        }

    };