diff options
| author | Brian Orr <brianorr@google.com> | 2021-05-13 20:42:01 -0700 |
|---|---|---|
| committer | Brian Orr <brianorr@google.com> | 2021-05-13 20:42:01 -0700 |
| commit | 1b62159ffcebb2c102e129b2e778a8f65b7e5948 (patch) | |
| tree | c28571796470b5c9e3d9e8c2dc8d49ddf819fd60 /mime | |
| parent | 86a43bb54c1ed3c75d072a2c465bf0447b5188c1 (diff) | |
| parent | 3a582255fbbf0840208ec8cee02f8401982f0e39 (diff) | |
Merge SP1A.210510.001
Change-Id: Ia86f3e18206beabe334e3081cedbaf5b3274f78e
Diffstat (limited to 'mime')
| -rw-r--r-- | mime/java-res/android.mime.types | 2 | ||||
| -rw-r--r-- | mime/java/android/content/type/DefaultMimeMapFactory.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types index 92365d1af4c9..587367737be0 100644 --- a/mime/java-res/android.mime.types +++ b/mime/java-res/android.mime.types @@ -139,7 +139,7 @@ # that may have been defined earlier. application/pgp-signature pgp -application/x-x509-ca-cert crt +application/x-x509-ca-cert crt der audio/aac aac adts adt audio/basic snd audio/flac flac diff --git a/mime/java/android/content/type/DefaultMimeMapFactory.java b/mime/java/android/content/type/DefaultMimeMapFactory.java index 11d20d4d6c80..bcd0eb0a9e39 100644 --- a/mime/java/android/content/type/DefaultMimeMapFactory.java +++ b/mime/java/android/content/type/DefaultMimeMapFactory.java @@ -96,7 +96,7 @@ public class DefaultMimeMapFactory { specs.add(spec); startIdx = endIdx + 1; // skip over the space } while (startIdx < line.length()); - builder.put(specs.get(0), specs.subList(1, specs.size())); + builder.addMimeMapping(specs.get(0), specs.subList(1, specs.size())); } } catch (IOException | RuntimeException e) { throw new RuntimeException("Failed to parse " + resourceName, e); |