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

Commit 8edd837b authored by Tobias Thierer's avatar Tobias Thierer
Browse files

Track MimeMap moving to libcore.content.type. 

Another CL in this topic moves libcore.net.MimeMap to package
libcore.content.type. This CL updates associated references.

Bug: 136256059
Bug: 124232146
Test: Treehugger
Test: CtsMimeMapTestCases
Exempt-From-Owner-Approval: move affecting imports only
Change-Id: I30aac8b28a1740180ea01834a2bb66b61cb255d4
parent 9ff2a6a0

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;