Rename canChangeSystemAudioMode on HdmiCecLocalDeviceTv with hasSystemAudioDevice. (e9cf1583) · Commits · e / os / android_frameworks_base

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

+12 −13

Original line number	Diff line number	Diff line
		@@ -286,11 +286,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
		new SystemAudioActionFromTv(this, avr.getLogicalAddress(), enabled, callback));
		}

		boolean canChangeSystemAudioMode() {
		// TODO: once have immutable device info, test whether avr info exists or not.
		return false;
		}

		void setSystemAudioMode(boolean on) {
		synchronized (mLock) {
		if (on != mSystemAudioMode) {
		@@ -504,6 +499,12 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
		return false;
		}

		@ServiceThreadOnly
		HdmiCecDeviceInfo getAvrDeviceInfo() {
		assertRunOnServiceThread();
		return getDeviceInfo(HdmiCec.ADDR_AUDIO_SYSTEM);
		}

		/**
		* Return a {@link HdmiCecDeviceInfo} corresponding to the given {@code logicalAddress}.
		*
		@@ -520,10 +521,12 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
		return mDeviceInfos.get(logicalAddress);
		}

		@ServiceThreadOnly
		HdmiCecDeviceInfo getAvrDeviceInfo() {
		assertRunOnServiceThread();
		return getDeviceInfo(HdmiCec.ADDR_AUDIO_SYSTEM);
		boolean hasSystemAudioDevice() {
		return getSafeAvrDeviceInfo() != null;
		}

		HdmiCecDeviceInfo getSafeAvrDeviceInfo() {
		return getSafeDeviceInfo(HdmiCec.ADDR_AUDIO_SYSTEM);
		}

		/**
		@@ -539,10 +542,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
		}
		}

		HdmiCecDeviceInfo getSafeAvrDeviceInfo() {
		return getSafeDeviceInfo(HdmiCec.ADDR_AUDIO_SYSTEM);
		}

		/**
		* Called when a device is newly added or a new device is detected.
		*

+1 −1

Original line number	Diff line number	Diff line
		@@ -672,7 +672,7 @@ public final class HdmiControlService extends SystemService {
		if (tv == null) {
		return false;
		}
		return tv.canChangeSystemAudioMode();
		return tv.hasSystemAudioDevice();
		}

		@Override