From daa61d45dacde440e3569d25ccf17ca4e2ba5d1a Mon Sep 17 00:00:00 2001
From: Daichi Hirono <hirono@google.com>
Date: Wed, 10 Aug 2016 14:59:18 +0900
Subject: [PATCH] Fix MtpDatabaseTest#testFormatCodeForMpeg.

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
---
 .../tests/src/com/android/mtp/MtpDatabaseTest.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java
index 404047b8baed8..031090f1d76a0 100644
--- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java
+++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java
@@ -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));