commit 9d576b58f37b86687716c438c3360672ed3df364
author Diksha Gohlyan <dikshag@google.com> Tue Mar 17 23:26:31 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 17 23:26:31 2020 +0000
tree c1b5f37e58725fc429ddfda4961b09bf2301f2de
parent 9f3271c0808e9e2227cc9279c0d7639b701e5618
parent bfadf609caa642212df8b59b72a1a1b48b810eba

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

Change-Id: I7d3e75dc0a55445377ad5b02910f204dee96c6a2

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

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