Merge "TIF: change onCreateSession() method signature" into lmp-dev (5b2295a5) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -16627,7 +16627,7 @@ package android.media.tv {
		public abstract class TvInputService extends android.app.Service {
		ctor public TvInputService();
		method public final android.os.IBinder onBind(android.content.Intent);
		method public abstract android.media.tv.TvInputService.Session onCreateSession();
		method public abstract android.media.tv.TvInputService.Session onCreateSession(java.lang.String);
		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";
		}

+1 −14

Original line number	Diff line number	Diff line
		@@ -143,27 +143,14 @@ public abstract class TvInputService extends Service {
		return mCallbacks.getRegisteredCallbackCount();
		}

		/**
		* Returns a concrete implementation of {@link Session}.
		* <p>
		* May return {@code null} if this TV input service fails to create a session for some reason.
		* </p>
		*/
		public abstract Session onCreateSession();

		/**
		* Returns a concrete implementation of {@link Session}.
		* <p>
		* May return {@code null} if this TV input service fails to create a session for some reason.
		* </p>
		* @param inputId The ID of the TV input associated with the session.
		*
		* @hide
		*/
		@SystemApi
		public Session onCreateSession(String inputId) {
		return onCreateSession();
		}
		public abstract Session onCreateSession(String inputId);

		/**
		* Returns a new TvInputInfo object if this service is responsible for {@code hardwareInfo};