From 533b34568280e61d885c3ea438fdb585ea2e4ba0 Mon Sep 17 00:00:00 2001 From: Jae Seo Date: Mon, 25 Jan 2016 20:28:06 -0800 Subject: [PATCH] TIF: Make TvInputService.onCreateRecordingSession a non-abstract method Change-Id: I1ecf5d2f66825fa9e87fd743d9d293d8bd395fce --- api/current.txt | 2 +- api/system-current.txt | 2 +- api/test-current.txt | 2 +- media/java/android/media/tv/TvInputService.java | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/api/current.txt b/api/current.txt index 230d22eb6dd77..a27fd1fed56b3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22457,7 +22457,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.RecordingSession onCreateRecordingSession(java.lang.String); + 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 final void setTvInputInfo(java.lang.String, android.media.tv.TvInputInfo); field public static final java.lang.String SERVICE_INTERFACE = "android.media.tv.TvInputService"; diff --git a/api/system-current.txt b/api/system-current.txt index dbaecd7aa784f..5513c82b57969 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -24011,7 +24011,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.RecordingSession onCreateRecordingSession(java.lang.String); + 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 android.media.tv.TvInputInfo onHardwareAdded(android.media.tv.TvInputHardwareInfo); method public java.lang.String onHardwareRemoved(android.media.tv.TvInputHardwareInfo); diff --git a/api/test-current.txt b/api/test-current.txt index 1a9b469a991ec..c313886bbd397 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -22465,7 +22465,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.RecordingSession onCreateRecordingSession(java.lang.String); + 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 final void setTvInputInfo(java.lang.String, android.media.tv.TvInputInfo); field public static final java.lang.String SERVICE_INTERFACE = "android.media.tv.TvInputService"; diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java index 6d9b1ad339a4d..f74ae660669aa 100644 --- a/media/java/android/media/tv/TvInputService.java +++ b/media/java/android/media/tv/TvInputService.java @@ -195,7 +195,9 @@ public abstract class TvInputService extends Service { * @param inputId The ID of the TV input associated with the recording session. */ @Nullable - public abstract RecordingSession onCreateRecordingSession(String inputId); + public RecordingSession onCreateRecordingSession(String inputId) { + return null; + } /** * Returns a new {@link TvInputInfo} object if this service is responsible for