diff options
| author | Andreas Huber <andih@google.com> | 2010-10-08 11:18:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-08 11:18:03 -0700 |
| commit | 2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7 (patch) | |
| tree | 398decc9b6a98cf073b75b230dbcd550363b7e3e /media/java | |
| parent | 5dcf588a81a59142985736d8bb0430586f68ec08 (diff) | |
| parent | f72dd0190ee64914161d361be1213eda8cab7b90 (diff) | |
| download | frameworks_base-2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7.zip frameworks_base-2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7.tar.gz frameworks_base-2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7.tar.bz2 | |
am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
Merge commit 'f72dd0190ee64914161d361be1213eda8cab7b90' into gingerbread-plus-aosp
* commit 'f72dd0190ee64914161d361be1213eda8cab7b90':
Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/Metadata.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/java/android/media/Metadata.java b/media/java/android/media/Metadata.java index bd25da2..8d408c2 100644 --- a/media/java/android/media/Metadata.java +++ b/media/java/android/media/Metadata.java @@ -102,8 +102,9 @@ public class Metadata public static final int PAUSE_AVAILABLE = 29; // Boolean public static final int SEEK_BACKWARD_AVAILABLE = 30; // Boolean public static final int SEEK_FORWARD_AVAILABLE = 31; // Boolean + public static final int SEEK_AVAILABLE = 32; // Boolean - private static final int LAST_SYSTEM = 31; + private static final int LAST_SYSTEM = 32; private static final int FIRST_CUSTOM = 8192; // Shorthands to set the MediaPlayer's metadata filter. |