diff options
author | Andreas Huber <andih@google.com> | 2010-10-10 17:14:53 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-10 17:14:53 -0700 |
commit | 37de60c179449a706ea41fea8384063723b0cb63 (patch) | |
tree | 61d5bc5effb307f88ae74ed970a3e1667ba49c30 /media/java/android | |
parent | cb4e40768096412c7d068a9cf27b1f5155ddfa94 (diff) | |
parent | 2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7 (diff) | |
download | frameworks_base-37de60c179449a706ea41fea8384063723b0cb63.zip frameworks_base-37de60c179449a706ea41fea8384063723b0cb63.tar.gz frameworks_base-37de60c179449a706ea41fea8384063723b0cb63.tar.bz2 |
am 2b4f1f4c: 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 '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7'
* commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7':
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/android')
-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. |