Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Track MimeMap moving to libcore.content.type."

Browse Source 
am: 0801b7c222

Change-Id: I63889b3eedb8f98c99d71172dc5cc32025a8afd4
This commit is contained in:
Tobias Thierer
2019-10-04 06:07:03 -07:00
committed by android-build-merger
parent db25a1bcf4 0801b7c222
commit 093c1e4eaa
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/webkit/MimeTypeMap.java
View File

@@ -19,7 +19,7 @@ package android.webkit;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import libcore.net.MimeMap; import libcore.content.type.MimeMap;
import java.util.regex.Pattern; import java.util.regex.Pattern;

2
core/java/com/android/internal/os/RuntimeInit.java
View File

@@ -35,7 +35,7 @@ import com.android.server.NetworkManagementSocketTagger;
import dalvik.system.RuntimeHooks; import dalvik.system.RuntimeHooks;
import dalvik.system.VMRuntime; import dalvik.system.VMRuntime;
import libcore.net.MimeMap; import libcore.content.type.MimeMap;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;

2
core/java/com/android/internal/util/MimeIconUtils.java
View File

@@ -27,7 +27,7 @@ import android.util.ArrayMap;
import com.android.internal.R; import com.android.internal.R;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import libcore.net.MimeMap; import libcore.content.type.MimeMap;
import java.util.Locale; import java.util.Locale;
import java.util.Objects; import java.util.Objects;

2
media/java/android/media/MediaFile.java
View File

@@ -23,7 +23,7 @@ import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.mtp.MtpConstants; import android.mtp.MtpConstants;
import libcore.net.MimeMap; import libcore.content.type.MimeMap;
import java.util.HashMap; import java.util.HashMap;

2
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaFileTest.java
View File

@@ -31,7 +31,7 @@ import android.mtp.MtpConstants;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import libcore.net.MimeMap; import libcore.content.type.MimeMap;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

2
mime/java/android/content/type/DefaultMimeMapFactory.java
View File

@@ -16,7 +16,7 @@
package android.content.type; package android.content.type;
import libcore.net.MimeMap; import libcore.content.type.MimeMap;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;