am d0d188e5: Merge "Remove unnecessary warning." into lmp-dev (65e6e769) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -732,7 +732,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
		}

		private void updateAudioManagerForSystemAudio(boolean on) {
		mService.getAudioManager().setHdmiSystemAudioSupported(on);
		int device = mService.getAudioManager().setHdmiSystemAudioSupported(on);
		HdmiLogger.debug("[A]UpdateSystemAudio mode[on=%b] output=[%X]", on, device);
		}

		boolean isSystemAudioActivated() {
		@@ -756,6 +757,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
		@ServiceThreadOnly
		boolean setArcStatus(boolean enabled) {
		assertRunOnServiceThread();

		HdmiLogger.debug("Set Arc Status[old:%b new:%b]", mArcEstablished, enabled);
		boolean oldStatus = mArcEstablished;
		// 1. Enable/disable ARC circuit.
		mService.setAudioReturnChannel(enabled);
		@@ -885,7 +888,9 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
		@ServiceThreadOnly
		void changeMute(boolean mute) {
		assertRunOnServiceThread();
		HdmiLogger.debug("[A]:Change mute:%b", mute);
		if (!isSystemAudioActivated()) {
		HdmiLogger.debug("[A]:System audio is not activated.");
		return;
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -67,8 +67,6 @@ abstract class RequestArcAction extends HdmiCecFeatureAction {
		} else {
		return false;
		}
		default:
		Slog.w(TAG, "Unsupported opcode:" + cmd.toString());
		}
		return false;
		}