summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorWonsik Kim <wonsik@google.com>2014-05-21 00:44:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-21 00:44:15 +0000
commit193909da71a342519ad640d157c122a38b6d1a3e (patch)
tree1ac49953a48c25c2b98ca3c555e15916b52b9b7e /core/java/android
parent7a8e6e59abf23640cdb21a0ed62934779a52b0c9 (diff)
parentf1c025cbcd98f2366d384c5aac114c330090a645 (diff)
downloadframeworks_base-193909da71a342519ad640d157c122a38b6d1a3e.zip
frameworks_base-193909da71a342519ad640d157c122a38b6d1a3e.tar.gz
frameworks_base-193909da71a342519ad640d157c122a38b6d1a3e.tar.bz2
Merge "Change visibility of TvInputManager.Session.setSurface()"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/tv/TvInputManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/tv/TvInputManager.java b/core/java/android/tv/TvInputManager.java
index c5f179a..dfa84f8 100644
--- a/core/java/android/tv/TvInputManager.java
+++ b/core/java/android/tv/TvInputManager.java
@@ -414,8 +414,9 @@ public final class TvInputManager {
*
* @param surface A {@link android.view.Surface} used to render video.
* @throws IllegalStateException if the session has been already released.
+ * @hide
*/
- void setSurface(Surface surface) {
+ public void setSurface(Surface surface) {
if (mToken == null) {
throw new IllegalStateException("the session has been already released");
}