diff options
author | 2025-03-10 11:54:23 -0700 | |
---|---|---|
committer | 2025-03-10 11:54:23 -0700 | |
commit | 9dff1b22978254951d7b625da03ceb5e8489ac1f (patch) | |
tree | 035eefc336f3a6cedd9fc6d85fabbfa159f67852 /src | |
parent | 859a10b144f576ed165304f14abf6174c0555abf (diff) |
Check for null mime type
The mime type could be null when looking up extension in getExtFromMimeType. Check it first to avoid an NPE.
Test: com.android.providers.media.util.MimeUtilsTest
Bug: 401468886
Flag: EXEMPT test fix
Change-Id: Ie4b5424da6d38a11e300995fd407d8429a67cd39
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/providers/media/util/MimeTypeFixHandler.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/providers/media/util/MimeTypeFixHandler.java b/src/com/android/providers/media/util/MimeTypeFixHandler.java index 3a58bdcc8..8bdd88ef1 100644 --- a/src/com/android/providers/media/util/MimeTypeFixHandler.java +++ b/src/com/android/providers/media/util/MimeTypeFixHandler.java @@ -163,6 +163,10 @@ public final class MimeTypeFixHandler { * @return Optional file extension, or empty. */ static Optional<String> getExtFromMimeType(String mimeType) { + if (mimeType == null) { + return Optional.empty(); + } + mimeType = mimeType.toLowerCase(Locale.ROOT); return Optional.ofNullable(sMimeTypeToExt.get(mimeType)); } |