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

Commit d90a9f5d authored by Diksha Gohlyan's avatar Diksha Gohlyan Committed by Automerger Merge Worker
Browse files

Merge "Tests incompatible with Q because MimeMap was recently added." into rvc-dev am: bfadf609 

Change-Id: I0477611c2b798341af3e0306dee6e086282111a2
parents bf82ad97 bfadf609

tests/common/com/android/documentsui/testing/TestModel.java

+2 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.database.MatrixCursor; 
import android.os.Bundle;

import android.provider.DocumentsContract;

import android.provider.DocumentsContract.Document;

import android.webkit.MimeTypeMap;



import com.android.documentsui.DirectoryResult;

import com.android.documentsui.Model;
@@ -28,8 +29,6 @@ import com.android.documentsui.base.Features; 
import com.android.documentsui.base.UserId;

import com.android.documentsui.roots.RootCursorWrapper;



import libcore.content.type.MimeMap;



import java.util.Random;



public class TestModel extends Model {
@@ -141,7 +140,7 @@ public class TestModel extends Model { 


        while(i != -1) {

            name = name.substring(i + 1);

            String type = MimeMap.getDefault().guessMimeTypeFromExtension(name);

            String type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(name);

            if (type != null) {

                return type;

            }