diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2010-03-12 11:10:56 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-12 11:10:56 -0800 |
| commit | d3d9b85ef4e2991480201df91455c2ad7b8e0b78 (patch) | |
| tree | 7a7f8f49033ffa3bdbb0cd98600ed794894ef378 /media/tests | |
| parent | 842f9df2c7944d5d7144b241763c65b497ba9312 (diff) | |
| parent | 806cdd82f0b5b1f720ee26ef3f20c8c1ec034f12 (diff) | |
| download | frameworks_base-d3d9b85ef4e2991480201df91455c2ad7b8e0b78.zip frameworks_base-d3d9b85ef4e2991480201df91455c2ad7b8e0b78.tar.gz frameworks_base-d3d9b85ef4e2991480201df91455c2ad7b8e0b78.tar.bz2 | |
Merge "Update the new activity name."
Diffstat (limited to 'media/tests')
| -rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMimeTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMimeTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMimeTest.java index ddf5e0b..8489a67 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMimeTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMimeTest.java @@ -49,7 +49,7 @@ public class MediaMimeTest extends ActivityInstrumentationTestCase2<MediaFramewo private final String TAG = "MediaMimeTest"; private Context mContext; private final String MP3_FILE = "/sdcard/media_api/music/SHORTMP3.mp3"; - private final String MEDIA_PLAYBACK_NAME = "com.android.music.MediaPlaybackActivity"; + private final String MEDIA_PLAYBACK_NAME = "com.android.music.MediaPlaybackActivityStarter"; public MediaMimeTest() { super("com.android.mediaframeworktest", MediaFrameworkTest.class); @@ -77,7 +77,7 @@ public class MediaMimeTest extends ActivityInstrumentationTestCase2<MediaFramewo assertMediaPlaybackActivityHandles("audio/mp3"); } - @MediumTest + @Suppress // Checks the MediaPlaybackActivity handles audio/*. public void testCheckMediaPlaybackHandlesAudio() throws Exception { assertMediaPlaybackActivityHandles("audio/*"); @@ -86,7 +86,7 @@ public class MediaMimeTest extends ActivityInstrumentationTestCase2<MediaFramewo // TODO: temporarily remove from medium suite because it hangs whole suite // @MediumTest // Checks the MediaPlaybackActivity handles application/itunes. Some servers - // set the Content-type header to application/iTunes (with capital T, but + // set the Content-type hadb ieader to application/iTunes (with capital T, but // the download manager downcasts it) for their MP3 podcasts. This is non // standard but we try to support it anyway. // See bug 1401491 |