diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2018-08-28 20:51:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-08-28 20:51:37 +0000 |
| commit | 202a16ec96540f5d38e2559c431987a3bf13afbb (patch) | |
| tree | 820b9533340a88228767472f6eed1db64699d835 /core/java/android | |
| parent | 1545cd72a2316606a4c211876ed9e78179b432d0 (diff) | |
| parent | 91e3cd4c6c1b00f606966a3af2abc0ef6f331bb0 (diff) | |
Merge "More robust MTP-to-MIME-type mappings."
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/ContentResolver.java | 6 | ||||
| -rw-r--r-- | core/java/android/os/FileUtils.java | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 5867a9c8890e..3bfb1c55fed6 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -437,6 +437,12 @@ public abstract class ContentResolver { */ public static final String ANY_CURSOR_ITEM_TYPE = "vnd.android.cursor.item/*"; + /** + * Default MIME type for files whose type is otherwise unknown. + * @hide + */ + public static final String MIME_TYPE_DEFAULT = "application/octet-stream"; + /** @hide */ @UnsupportedAppUsage public static final int SYNC_ERROR_SYNC_ALREADY_IN_PROGRESS = 1; diff --git a/core/java/android/os/FileUtils.java b/core/java/android/os/FileUtils.java index 3a3d9ea0b44f..1c8029caab70 100644 --- a/core/java/android/os/FileUtils.java +++ b/core/java/android/os/FileUtils.java @@ -23,6 +23,7 @@ import static android.system.OsConstants.S_ISREG; import android.annotation.NonNull; import android.annotation.Nullable; +import android.content.ContentResolver; import android.provider.DocumentsContract.Document; import android.system.ErrnoException; import android.system.Os; @@ -1057,7 +1058,7 @@ public class FileUtils { } if (mimeTypeFromExt == null) { - mimeTypeFromExt = "application/octet-stream"; + mimeTypeFromExt = ContentResolver.MIME_TYPE_DEFAULT; } final String extFromMimeType = MimeTypeMap.getSingleton().getExtensionFromMimeType( |