Merge remote-tracking branch 'origin/lineage-22.2' into a15 (07a61520) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -12484,7 +12484,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);
		}
		}
		};
		@@ -12497,6 +12498,7 @@ public class AudioService extends IAudioService.Stub
		if (mHdmiManager == null) return;
		mHdmiCecVolumeControlEnabled =
		hdmiCecVolumeControl == HdmiControlManager.VOLUME_CONTROL_ENABLED;
		updateHdmiCecSinkLocked(mHdmiCecVolumeControlEnabled);
		}
		}
		};