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

Merge "Add 'audio/mp3' to android.mime.types"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-08-04 15:47:33 +00:00
committed by Android (Google) Code Review
parent 981e874af3 6a79d348d8
commit 95ec79c7f3
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/tests/coretests/src/android/os/FileUtilsTest.java
View File

@@ -58,10 +58,10 @@ import android.provider.DocumentsContract.Document;
import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;
import libcore.io.Streams;
import com.google.android.collect.Sets;
import libcore.io.Streams;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -477,6 +477,14 @@ public class FileUtilsTest {
new File(mTarget, "test (1).jpg").createNewFile();
assertNameEquals("test (2).jpg",
FileUtils.buildUniqueFile(mTarget, "image/jpeg", "test.jpg"));
assertNameEquals("test.mp3", FileUtils.buildUniqueFile(mTarget, "audio/mp3", "test.mp3"));
new File(mTarget, "test.mp3").createNewFile();
assertNameEquals("test (1).mp3",
FileUtils.buildUniqueFile(mTarget, "audio/mp3", "test.mp3"));
new File(mTarget, "test (1).mp3").createNewFile();
assertNameEquals("test (2).mp3",
FileUtils.buildUniqueFile(mTarget, "audio/mp3", "test.mp3"));
}
@Test

1
mime/java-res/android.mime.types
View File

@@ -86,6 +86,7 @@
?audio/x-matroska mka
?audio/x-pn-realaudio ra
?audio/x-mpeg mp3
?audio/mp3 mp3
?image/bmp bmp
?image/gif gif