Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d89dc40 authored by Tomasz Mikolajewski's avatar Tomasz Mikolajewski
Browse files

Replace hardcoded numeric literals with those in MtpConstants. 

Change-Id: Idbac906fefd6da060a88a256187f124359f2205c
parent 9dbde7b0

packages/MtpDocumentsProvider/src/com/android/mtp/CursorHelper.java

+8 −7
Original line number Diff line number Diff line
@@ -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;

        }

    }

}

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

+3 −3
Original line number Diff line number Diff line
@@ -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)