diff --git a/api/current.txt b/api/current.txt
index 13f46dc3492f9..59caa116f2660 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -16629,7 +16629,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";
   }
diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java
index fccc3ce800209..9a7b148f4086f 100644
--- a/media/java/android/media/tv/TvInputService.java
+++ b/media/java/android/media/tv/TvInputService.java
@@ -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};