diff options
| author | John Spurlock <jspurlock@google.com> | 2015-03-27 21:13:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-27 21:13:22 +0000 |
| commit | 0f09c3d0b6d483bbb457c62d67fac921f85e073a (patch) | |
| tree | 7b19cc3b3d117b12b2d2239ef37c23515b79c621 /media | |
| parent | 98170b0db191f916bf2a0f104f5d5057c2aaeaa9 (diff) | |
| parent | bc4cf00dc5bf6e0e3c01206d5c46e64306df260a (diff) | |
| download | frameworks_base-0f09c3d0b6d483bbb457c62d67fac921f85e073a.zip frameworks_base-0f09c3d0b6d483bbb457c62d67fac921f85e073a.tar.gz frameworks_base-0f09c3d0b6d483bbb457c62d67fac921f85e073a.tar.bz2 | |
Merge "Fix a few found doc problems."
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaRouter.java | 6 | ||||
| -rw-r--r-- | media/java/android/media/session/MediaController.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java index b4c612a..c227eb7 100644 --- a/media/java/android/media/MediaRouter.java +++ b/media/java/android/media/MediaRouter.java @@ -1500,18 +1500,18 @@ public class MediaRouter { /** * The default playback type, "local", indicating the presentation of the media is happening - * on the same device (e.g. a phone, a tablet) as where it is controlled from. + * on the same device (e.g. a phone, a tablet) as where it is controlled from. * @see #getPlaybackType() */ public final static int PLAYBACK_TYPE_LOCAL = 0; /** * A playback type indicating the presentation of the media is happening on - * a different device (i.e. the remote device) than where it is controlled from. + * a different device (i.e. the remote device) than where it is controlled from. * @see #getPlaybackType() */ public final static int PLAYBACK_TYPE_REMOTE = 1; /** - * Playback information indicating the playback volume is fixed, i.e. it cannot be + * Playback information indicating the playback volume is fixed, i.e. it cannot be * controlled from this object. An example of fixed playback volume is a remote player, * playing over HDMI where the user prefers to control the volume on the HDMI sink, rather * than attenuate at the source. diff --git a/media/java/android/media/session/MediaController.java b/media/java/android/media/session/MediaController.java index 8def486..dd81a22 100644 --- a/media/java/android/media/session/MediaController.java +++ b/media/java/android/media/session/MediaController.java @@ -516,8 +516,8 @@ public final class MediaController { } /** - * Callback for receiving updates on from the session. A Callback can be - * registered using {@link #registerCallback} + * Callback for receiving updates from the session. A Callback can be + * registered using {@link #registerCallback}. */ public static abstract class Callback { /** |