commit 12b988ae6e601360de000f86761f9157100d2a47
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 09 18:38:35 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 09 18:38:35 2019 +0000
tree 1855d21128323c839ab712c27b07eea3dbb6033f
parent 472c9ccf67c0e18dafbdff76716142dcc7f474c1
parent e59d0aa342dcbfdcf901427b57cfcc6e51f3bd9e

Merge "Add placeholder for core library public stubs source"

luni/src/main/java/libcore/content/type/MimeMap.java

diff --git a/luni/src/main/java/libcore/content/type/MimeMap.java b/luni/src/main/java/libcore/content/type/MimeMap.java
index a9149d1..51e792f 100644
--- a/luni/src/main/java/libcore/content/type/MimeMap.java
+++ b/luni/src/main/java/libcore/content/type/MimeMap.java
@@ -362,18 +362,22 @@
     }
 
     private static boolean isValidMimeTypeOrExtension(String s) {
-        return s != null && !s.isEmpty() && !s.contains("?") && !s.contains(" ")
+        return s != null
+                && !s.isEmpty()
+                && s.indexOf('?') < 0
+                && s.indexOf(' ') < 0
+                && s.indexOf('\t') < 0
                 && s.equals(toLowerCase(s));
     }
 
     static void checkValidMimeType(String s) {
-        if (!isValidMimeTypeOrExtension(s) || !s.contains("/")) {
+        if (!isValidMimeTypeOrExtension(s) || s.indexOf('/') < 0) {
             throw new IllegalArgumentException("Invalid MIME type: " + s);
         }
     }
 
     static void checkValidExtension(String s) {
-        if (!isValidMimeTypeOrExtension(s) || s.contains("/")) {
+        if (!isValidMimeTypeOrExtension(s) || s.indexOf('/') >= 0) {
             throw new IllegalArgumentException("Invalid extension: " + s);
         }
     }