Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80c5c5b5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by android-build-merger
Browse files

Merge "TIF: Specify the default implementation of onTune(Uri, Bundle)" into nyc-dev am: 6f8476dc 

am: d39f9458

* commit 'd39f9458':
  TIF: Specify the default implementation of onTune(Uri, Bundle)

Change-Id: I00a1f380d288bdc81f65845a8acce093c1c62689
parents d7ed181f d39f9458

media/java/android/media/tv/TvInputService.java

+7 −4
Original line number Diff line number Diff line
@@ -839,9 +839,11 @@ public abstract class TvInputService extends Service { 
        public abstract boolean onTune(Uri channelUri);



        /**

         * Calls {@link #onTune(Uri)}. Override this method in order to handle domain-specific

         * Tunes to a given channel. Override this method in order to handle domain-specific

         * features that are only known between certain TV inputs and their clients.

         *

         * <p>The default implementation calls {@link #onTune(Uri)}.

         *

         * @param channelUri The URI of the channel.

         * @param params Domain-specific data for this tune request. Keys <em>must</em> be a scoped

         *            name, i.e. prefixed with a package name you own, so that different developers
@@ -1693,11 +1695,12 @@ public abstract class TvInputService extends Service { 
        public abstract void onTune(Uri channelUri);



        /**

         * Calls {@link #onTune(Uri)}. Override this method in order to handle domain-specific

         * features that are only known between certain TV inputs and their clients.

         * Called when the application requests to tune to a given channel for TV program recording.

         * Override this method in order to handle domain-specific features that are only known

         * between certain TV inputs and their clients.

         *

         * <p>The application may call this method before starting or after stopping recording, but

         * not during recording.

         * not during recording. The default implementation calls {@link #onTune(Uri)}.

         *

         * <p>The session must call {@link #notifyTuned(Uri)} if the tune request was fulfilled, or

         * {@link #notifyError(int)} otherwise.