Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e1b81079: am 480dd588: am 5fec7afe: Merge "TIF: change onCreateSession() method signature" into lmp-dev

Browse Source 
* commit 'e1b810793924956eb5517cd4e2c57a721e8f750e':
  TIF: change onCreateSession() method signature
This commit is contained in:
Wonsik Kim
2014-07-18 13:13:37 +00:00
committed by Android Git Automerger
parent f5eb7e4870 c27b371f3d
commit 25d39bc334
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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";
}

15
media/java/android/media/tv/TvInputService.java
View File

@@ -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};