Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 519e0591 authored Feb 17, 2016 by Jae Seo Committed by Android (Google) Code Review Feb 17, 2016

Merge "TIF: Rename setTvInputInfo to updateTvInputInfo" into nyc-dev

parents a1c8cfe0 aa5605ff

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -22977,7 +22977,7 @@ package android.media.tv {
		method public void onInputRemoved(java.lang.String);
		method public void onInputStateChanged(java.lang.String, int);
		method public void onInputUpdated(java.lang.String);
		method public void onTvInputInfoChanged(android.media.tv.TvInputInfo);
		method public void onTvInputInfoUpdated(android.media.tv.TvInputInfo);
		}

		public abstract class TvInputService extends android.app.Service {
		@@ -22985,7 +22985,7 @@ package android.media.tv {
		method public final android.os.IBinder onBind(android.content.Intent);
		method public android.media.tv.TvInputService.RecordingSession onCreateRecordingSession(java.lang.String);
		method public abstract android.media.tv.TvInputService.Session onCreateSession(java.lang.String);
		method public static final void setTvInputInfo(android.content.Context, android.media.tv.TvInputInfo);
		method public static final void updateTvInputInfo(android.content.Context, android.media.tv.TvInputInfo);
		field public static final java.lang.String SERVICE_INTERFACE = "android.media.tv.TvInputService";
		field public static final java.lang.String SERVICE_META_DATA = "android.media.tv.input";
		}

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -24720,7 +24720,7 @@ package android.media.tv {
		method public void onInputRemoved(java.lang.String);
		method public void onInputStateChanged(java.lang.String, int);
		method public void onInputUpdated(java.lang.String);
		method public void onTvInputInfoChanged(android.media.tv.TvInputInfo);
		method public void onTvInputInfoUpdated(android.media.tv.TvInputInfo);
		}

		public abstract class TvInputService extends android.app.Service {
		@@ -24732,7 +24732,7 @@ package android.media.tv {
		method public java.lang.String onHardwareRemoved(android.media.tv.TvInputHardwareInfo);
		method public android.media.tv.TvInputInfo onHdmiDeviceAdded(android.hardware.hdmi.HdmiDeviceInfo);
		method public java.lang.String onHdmiDeviceRemoved(android.hardware.hdmi.HdmiDeviceInfo);
		method public static final void setTvInputInfo(android.content.Context, android.media.tv.TvInputInfo);
		method public static final void updateTvInputInfo(android.content.Context, android.media.tv.TvInputInfo);
		field public static final java.lang.String SERVICE_INTERFACE = "android.media.tv.TvInputService";
		field public static final java.lang.String SERVICE_META_DATA = "android.media.tv.input";
		}

api/test-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -22986,7 +22986,7 @@ package android.media.tv {
		method public void onInputRemoved(java.lang.String);
		method public void onInputStateChanged(java.lang.String, int);
		method public void onInputUpdated(java.lang.String);
		method public void onTvInputInfoChanged(android.media.tv.TvInputInfo);
		method public void onTvInputInfoUpdated(android.media.tv.TvInputInfo);
		}

		public abstract class TvInputService extends android.app.Service {
		@@ -22994,7 +22994,7 @@ package android.media.tv {
		method public final android.os.IBinder onBind(android.content.Intent);
		method public android.media.tv.TvInputService.RecordingSession onCreateRecordingSession(java.lang.String);
		method public abstract android.media.tv.TvInputService.Session onCreateSession(java.lang.String);
		method public static final void setTvInputInfo(android.content.Context, android.media.tv.TvInputInfo);
		method public static final void updateTvInputInfo(android.content.Context, android.media.tv.TvInputInfo);
		field public static final java.lang.String SERVICE_INTERFACE = "android.media.tv.TvInputService";
		field public static final java.lang.String SERVICE_META_DATA = "android.media.tv.input";
		}

media/java/android/media/tv/ITvInputManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ import android.view.Surface;
		interface ITvInputManager {
		List<TvInputInfo> getTvInputList(int userId);
		TvInputInfo getTvInputInfo(in String inputId, int userId);
		void setTvInputInfo(in TvInputInfo inputInfo, int userId);
		void updateTvInputInfo(in TvInputInfo inputInfo, int userId);
		int getTvInputState(in String inputId, int userId);

		List<TvContentRatingSystemInfo> getTvContentRatingSystemList(int userId);

media/java/android/media/tv/ITvInputManagerCallback.aidl

+1 −3

Original line number	Diff line number	Diff line
		@@ -26,8 +26,6 @@ oneway interface ITvInputManagerCallback {
		void onInputAdded(in String inputId);
		void onInputRemoved(in String inputId);
		void onInputUpdated(in String inputId);

		void onInputStateChanged(in String inputId, int state);

		void onTvInputInfoChanged(in TvInputInfo TvInputInfo);
		void onTvInputInfoUpdated(in TvInputInfo TvInputInfo);
		}