Merge "CEC: API setSystemAudioMode" (6fd2d1d5) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -14198,6 +14198,7 @@ package android.hardware.hdmi {
		method public void setHdmiMhlVendorCommandListener(android.hardware.hdmi.HdmiTvClient.HdmiMhlVendorCommandListener);
		method public void setInputChangeListener(android.hardware.hdmi.HdmiTvClient.InputChangeListener);
		method public void setRecordListener(android.hardware.hdmi.HdmiRecordListener);
		method public void setSystemAudioMode(boolean, android.hardware.hdmi.HdmiTvClient.SelectCallback);
		method public void setSystemAudioMute(boolean);
		method public void setSystemAudioVolume(int, int, int);
		method public void startOneTouchRecord(int, android.hardware.hdmi.HdmiRecordSources.RecordSource);

+18 −3

Original line number	Diff line number	Diff line
		@@ -168,7 +168,22 @@ public final class HdmiTvClient extends HdmiClient {
		}

		/**
		* Sets system audio volume
		* Sets system audio mode.
		*
		* @param enabled set to {@code true} to enable the mode; otherwise {@code false}
		* @param callback callback to get the result with
		* @throws {@link IllegalArgumentException} if the {@code callback} is null
		*/
		public void setSystemAudioMode(boolean enabled, SelectCallback callback) {
		try {
		mService.setSystemAudioMode(enabled, getCallbackWrapper(callback));
		} catch (RemoteException e) {
		Log.e(TAG, "failed to set system audio mode:", e);
		}
		}

		/**
		* Sets system audio volume.
		*
		* @param oldIndex current volume index
		* @param newIndex volume index to be set
		@@ -183,7 +198,7 @@ public final class HdmiTvClient extends HdmiClient {
		}

		/**
		* Sets system audio mute status
		* Sets system audio mute status.
		*
		* @param mute {@code true} if muted; otherwise, {@code false}
		*/
		@@ -196,7 +211,7 @@ public final class HdmiTvClient extends HdmiClient {
		}

		/**
		* Sets record listener
		* Sets record listener.
		*
		* @param listener
		*/