Merge "Remove dispatchKeyEventToHdmi()" (656a75fe) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -27217,7 +27217,6 @@ package android.media.tv {
		}

		public static final class TvInputManager.Hardware {
		method public boolean dispatchKeyEventToHdmi(android.view.KeyEvent);
		method public void overrideAudioSink(int, java.lang.String, int, int, int);
		method public void setStreamVolume(float);
		method public boolean setSurface(android.view.Surface, android.media.tv.TvStreamConfig);

+4 −0

Original line number	Diff line number	Diff line
		@@ -275,6 +275,10 @@ package android.media.tv {
		method public android.media.tv.TvInputManager.Hardware acquireTvInputHardware(int, android.media.tv.TvInputManager.HardwareCallback, android.media.tv.TvInputInfo);
		}

		public static final class TvInputManager.Hardware {
		method public boolean dispatchKeyEventToHdmi(android.view.KeyEvent);
		}

		public class TvView extends android.view.ViewGroup {
		method public void requestUnblockContent(android.media.tv.TvContentRating);
		}

+0 −6

Original line number	Diff line number	Diff line
		@@ -39,12 +39,6 @@ interface ITvInputHardware {
		*/
		void setStreamVolume(float volume);

		/**
		* Dispatch key event to HDMI service. The events would be automatically converted to
		* HDMI CEC commands. If the hardware is not representing an HDMI port, this method will fail.
		*/
		boolean dispatchKeyEventToHdmi(in KeyEvent event);

		/**
		* Override default audio sink from audio policy. When override is on, it is
		* TvInputService's responsibility to adjust to audio configuration change

+2 −5

Original line number	Diff line number	Diff line
		@@ -2590,12 +2590,9 @@ public final class TvInputManager {
		}
		}

		/** @removed */
		public boolean dispatchKeyEventToHdmi(KeyEvent event) {
		try {
		return mInterface.dispatchKeyEventToHdmi(event);
		} catch (RemoteException e) {
		throw new RuntimeException(e);
		}
		return false;
		}

		public void overrideAudioSink(int audioType, String audioAddress, int samplingRate,

+0 −14

Original line number	Diff line number	Diff line
		@@ -1022,20 +1022,6 @@ class TvInputHardwareManager implements TvInputHal.Callback {
		}
		}

		@Override
		public boolean dispatchKeyEventToHdmi(KeyEvent event) throws RemoteException {
		synchronized (mImplLock) {
		if (mReleased) {
		throw new IllegalStateException("Device already released.");
		}
		}
		if (mInfo.getType() != TvInputHardwareInfo.TV_INPUT_TYPE_HDMI) {
		return false;
		}
		// TODO(hdmi): mHdmiClient.sendKeyEvent(event);
		return false;
		}

		private boolean startCapture(Surface surface, TvStreamConfig config) {
		synchronized (mImplLock) {
		if (mReleased) {