diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2009-09-17 09:50:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-17 09:50:39 -0700 |
| commit | 3aea463e3dfd817a09a1969671e97297c4abaeb3 (patch) | |
| tree | c70399b03bbe40be427b02e5816a625e4f3de631 | |
| parent | e39646b8366de222abbce74e467b068bcead8776 (diff) | |
| parent | 036033fc6dcce36550f2d7fc9a0f64bc3b8d285b (diff) | |
| download | frameworks_base-3aea463e3dfd817a09a1969671e97297c4abaeb3.zip frameworks_base-3aea463e3dfd817a09a1969671e97297c4abaeb3.tar.gz frameworks_base-3aea463e3dfd817a09a1969671e97297c4abaeb3.tar.bz2 | |
am 036033fc: am 610e3595: modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java Fixed the meta data duration
Merge commit '036033fc6dcce36550f2d7fc9a0f64bc3b8d285b'
* commit '036033fc6dcce36550f2d7fc9a0f64bc3b8d285b':
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
| -rwxr-xr-x | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java index a86ef8f9..ef211b3 100755 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java @@ -406,7 +406,7 @@ public class MediaNames { public static final String META_DATA_OTHERS [][] = { {"/sdcard/media_api/metaDataTestMedias/3GP/cat.3gp", null, null, null, null, null, "20080309T002415.000Z", null, - null, null, "1404928", "2", null}, + null, null, "63916", "2", null}, {"/sdcard/media_api/metaDataTestMedias/AMR/AMR_NB.amr", null, null, null, null, null, null, null, null, null, "126540", "1", null}, @@ -424,7 +424,7 @@ public class MediaNames { null, null, "2005", "231180", "1", null}, {"/sdcard/media_api/metaDataTestMedias/MP4/kung_fu_panda_h264.mp4", "2/0", "mp4 album Kung Fu Panda", "mp4 artist Kung Fu Panda", null, null, "20080517T091451.000Z", - "41", "Kung Fu Panda", "2008", "77113", "2", "mp4 composer"}, + "41", "Kung Fu Panda", "2008", "128521", "2", "mp4 composer"}, {"/sdcard/media_api/metaDataTestMedias/OGG/Ring_Classic_02.ogg", null, "Suspended Animation", "John Petrucci", null, null, "20070510T125223.000Z", null, null, "2005", "231180", "1", null}, |