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

1 files changed, 2 insertions, 3 deletions

diff --git a/tests/common/com/android/documentsui/testing/TestModel.java b/tests/common/com/android/documentsui/testing/TestModel.java
index b1fada438..5a0ff89d3 100644
--- a/tests/common/com/android/documentsui/testing/TestModel.java
+++ b/tests/common/com/android/documentsui/testing/TestModel.java
@@ -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;
             }