summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJae Seo <jaeseo@google.com>2015-06-05 18:05:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-05 18:05:33 +0000
commit5f185270375e55a53ddb57982827ec0ac3edcf85 (patch)
tree54280b63c3286a1d90e66abd481687ba0a77a327 /media
parentc3426128fe2e263140f6977a0f28ba5bd3a7d906 (diff)
parent4640d3d81a182e8f3ce50199bff1d97519d27938 (diff)
downloadframeworks_base-5f185270375e55a53ddb57982827ec0ac3edcf85.zip
frameworks_base-5f185270375e55a53ddb57982827ec0ac3edcf85.tar.gz
frameworks_base-5f185270375e55a53ddb57982827ec0ac3edcf85.tar.bz2
Merge "TIF: Add more explanation for notifyChannelRetuned" into mnc-dev
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/tv/TvInputService.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java
index d480696..f75d601 100644
--- a/media/java/android/media/tv/TvInputService.java
+++ b/media/java/android/media/tv/TvInputService.java
@@ -27,7 +27,6 @@ import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.hardware.hdmi.HdmiDeviceInfo;
import android.media.PlaybackParams;
-import android.media.tv.TvInputService.HardwareSession;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
@@ -341,9 +340,13 @@ public abstract class TvInputService extends Service {
}
/**
- * Notifies the channel of the session is retuned by TV input.
+ * Informs the application that the current channel is re-tuned for some reason and the
+ * session now displays the content from a new channel. This is used to handle special cases
+ * such as when the current channel becomes unavailable, it is necessary to send the user to
+ * a certain channel or the user changes channel in some other way (e.g. by using a
+ * dedicated remote).
*
- * @param channelUri The URI of a channel.
+ * @param channelUri The URI of the new channel.
*/
public void notifyChannelRetuned(final Uri channelUri) {
executeOrPostRunnable(new Runnable() {