OSDN Git Service

Fix MtpDatabaseTest#testFormatCodeForMpeg.
authorDaichi Hirono <hirono@google.com>
Wed, 10 Aug 2016 05:59:18 +0000 (14:59 +0900)
committerDaichi Hirono <hirono@google.com>
Wed, 10 Aug 2016 05:59:18 +0000 (14:59 +0900)
ag/1241051 explicitly specified the primary mime type for MTP format
code. And it changes mime type for MtpConstants.FORMAT_MPEG from
video/mp4 to video/mpeg.

FIX=30266226

Change-Id: I362bd7d651140b9928aa76e0d54e4769296d9498

packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java

index 404047b..031090f 100644 (file)
@@ -1115,7 +1115,7 @@ public class MtpDatabaseTest extends AndroidTestCase {
             // Don't return mime type that is inconsistent with format code.
             cursor.moveToNext();
             assertEquals("inconsistent.txt", cursor.getString(0));
-            assertEquals("video/mp4", cursor.getString(1));
+            assertEquals("video/mpeg", cursor.getString(1));
             cursor.moveToNext();
             assertEquals("noext", cursor.getString(0));
             assertEquals("application/octet-stream", cursor.getString(1));