From 9d89dc40f175a93bce34a1572b720684356fc272 Mon Sep 17 00:00:00 2001
From: Tomasz Mikolajewski <mtomasz@google.com>
Date: Tue, 1 Sep 2015 09:30:43 +0900
Subject: [PATCH] Replace hardcoded numeric literals with those in
 MtpConstants.

Change-Id: Idbac906fefd6da060a88a256187f124359f2205c
---
 .../src/com/android/mtp/CursorHelper.java         | 15 ++++++++-------
 .../com/android/mtp/MtpDocumentsProviderTest.java |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/CursorHelper.java b/packages/MtpDocumentsProvider/src/com/android/mtp/CursorHelper.java
index 48d5dcfeb5f51..b5694b73a239c 100644
--- a/packages/MtpDocumentsProvider/src/com/android/mtp/CursorHelper.java
+++ b/packages/MtpDocumentsProvider/src/com/android/mtp/CursorHelper.java
@@ -17,6 +17,7 @@
 package com.android.mtp;
 
 import android.database.MatrixCursor;
+import android.mtp.MtpConstants;
 import android.mtp.MtpObjectInfo;
 import android.provider.DocumentsContract;
 import android.provider.DocumentsContract.Document;
@@ -72,11 +73,11 @@ final class CursorHelper {
     static String formatTypeToMimeType(int format) {
         // TODO: Add complete list of mime types.
         switch (format) {
-            case 0x3001:
+            case MtpConstants.FORMAT_ASSOCIATION:
                 return DocumentsContract.Document.MIME_TYPE_DIR;
-            case 0x3009:
+            case MtpConstants.FORMAT_MP3:
                 return "audio/mp3";
-            case 0x3801:
+            case MtpConstants.FORMAT_EXIF_JPEG:
                 return "image/jpeg";
             default:
                 return "application/octet-stream";
@@ -87,13 +88,13 @@ final class CursorHelper {
         // TODO: Add complete list of mime types.
         switch (mimeType.toLowerCase()) {
             case Document.MIME_TYPE_DIR:
-                return 0x3001;
+                return MtpConstants.FORMAT_ASSOCIATION;
             case "audio/mp3":
-                return 0x3009;
+                return MtpConstants.FORMAT_MP3;
             case "image/jpeg":
-                return 0x3801;
+                return MtpConstants.FORMAT_EXIF_JPEG;
             default:
-                return 0x3000;  // Undefined object.
+                return MtpConstants.FORMAT_UNDEFINED;
         }
     }
 }
diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java
index cbb72d14f52e3..9b316be48a157 100644
--- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java
+++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java
@@ -209,7 +209,7 @@ public class MtpDocumentsProviderTest extends AndroidTestCase {
     public void testQueryDocument() throws IOException {
         mMtpManager.setObjectInfo(0, new MtpObjectInfo.Builder()
                 .setObjectHandle(2)
-                .setFormat(0x3801)
+                .setFormat(MtpConstants.FORMAT_EXIF_JPEG)
                 .setName("image.jpg")
                 .setDateModified(1422716400000L)
                 .setCompressedSize(1024 * 1024 * 5)
@@ -234,7 +234,7 @@ public class MtpDocumentsProviderTest extends AndroidTestCase {
     public void testQueryDocument_directory() throws IOException {
         mMtpManager.setObjectInfo(0, new MtpObjectInfo.Builder()
                 .setObjectHandle(2)
-                .setFormat(0x3001 /* directory format */)
+                .setFormat(MtpConstants.FORMAT_ASSOCIATION)
                 .setName("directory")
                 .setDateModified(1422716400000L)
                 .build());
@@ -281,7 +281,7 @@ public class MtpDocumentsProviderTest extends AndroidTestCase {
 
         mMtpManager.setObjectInfo(0, new MtpObjectInfo.Builder()
                 .setObjectHandle(1)
-                .setFormat(0x3801 /* JPEG */)
+                .setFormat(MtpConstants.FORMAT_EXIF_JPEG)
                 .setName("image.jpg")
                 .setCompressedSize(1024 * 1024 * 5)
                 .setThumbCompressedSize(5 * 1024)