summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorWonsik Kim <wonsik@google.com>2014-07-18 04:34:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-17 21:07:39 +0000
commit5b2295a521105dd7303de775d6d3c343a1b49788 (patch)
treeaf12b957511ee2361f20c103c1dbafcb6bd16323 /media
parent3b0f928475d72dab6ec76b809dd1e51aa4b4c44b (diff)
parent1032f034ff4f0506872e4899b5a232057abe724b (diff)
downloadframeworks_base-5b2295a521105dd7303de775d6d3c343a1b49788.zip
frameworks_base-5b2295a521105dd7303de775d6d3c343a1b49788.tar.gz
frameworks_base-5b2295a521105dd7303de775d6d3c343a1b49788.tar.bz2
Merge "TIF: change onCreateSession() method signature" into lmp-dev
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/tv/TvInputService.java15
1 files changed, 1 insertions, 14 deletions
diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java
index fccc3ce..9a7b148 100644
--- a/media/java/android/media/tv/TvInputService.java
+++ b/media/java/android/media/tv/TvInputService.java
@@ -148,22 +148,9 @@ public abstract class TvInputService extends Service {
* <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};