Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo

Browse Source 
Merge commit 'e43e563e73ab6b1af2b3276a4917976b112f5cda' into froyo-plus-aosp

* commit 'e43e563e73ab6b1af2b3276a4917976b112f5cda':
  Don't check whether a specific named activity supports mp3 playback,
This commit is contained in:
Marco Nelissen
2010-04-07 13:33:11 -07:00
committed by Android Git Automerger
parent dbad286c46 e43e563e73
commit ca9a083bcf
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMimeTest.java
View File

@@ -49,7 +49,6 @@ 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.MediaPlaybackActivityStarter";
public MediaMimeTest() {
super("com.android.mediaframeworktest", MediaFrameworkTest.class);
@@ -129,7 +128,6 @@ public class MediaMimeTest extends ActivityInstrumentationTestCase2<MediaFramewo
ResolveInfo ri = resolveMime(mime);
assertNotNull(ri);
assertEquals(MEDIA_PLAYBACK_NAME, ri.activityInfo.name.toString());
}
// Helper method to check that NO activity handles the given mime type.