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

Commit b43f746c authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "Track MimeMap moving to libcore.content.type." am: 0801b7c2 

am: 093c1e4e

Change-Id: If2b46820dc9ba3d8ba6b8f542521f3818b0074c9
parents 6d6dc567 093c1e4e

core/java/android/webkit/MimeTypeMap.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.webkit; 
import android.annotation.Nullable;

import android.text.TextUtils;



import libcore.net.MimeMap;

import libcore.content.type.MimeMap;



import java.util.regex.Pattern;

core/java/com/android/internal/os/RuntimeInit.java

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import com.android.server.NetworkManagementSocketTagger; 
import dalvik.system.RuntimeHooks;

import dalvik.system.VMRuntime;



import libcore.net.MimeMap;

import libcore.content.type.MimeMap;



import java.lang.reflect.InvocationTargetException;

import java.lang.reflect.Method;

core/java/com/android/internal/util/MimeIconUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.util.ArrayMap; 
import com.android.internal.R;

import com.android.internal.annotations.GuardedBy;



import libcore.net.MimeMap;

import libcore.content.type.MimeMap;



import java.util.Locale;

import java.util.Objects;

media/java/android/media/MediaFile.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.annotation.Nullable; 
import android.annotation.UnsupportedAppUsage;

import android.mtp.MtpConstants;



import libcore.net.MimeMap;

import libcore.content.type.MimeMap;



import java.util.HashMap;

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import android.mtp.MtpConstants; 


import androidx.test.runner.AndroidJUnit4;



import libcore.net.MimeMap;

import libcore.content.type.MimeMap;



import org.junit.Test;

import org.junit.runner.RunWith;