diff options
| author | 2016-02-12 00:51:28 +0000 | |
|---|---|---|
| committer | 2016-02-12 00:51:29 +0000 | |
| commit | f4fe20ad71fe35f628929dd3f1456811fb20e762 (patch) | |
| tree | 1704ec5377a63a0ec5291c328b0773114000d1ab | |
| parent | 089c9c0c6c718479bfa32ffbdc4d0bdb3d0784ae (diff) | |
| parent | ef2feefab704c07a7efd5fd3e6cbe83d0930b4f9 (diff) | |
Merge "Returns "application/octet-stream" for unknown types of MTP files." into nyc-dev
| -rw-r--r-- | packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java | 17 | ||||
| -rw-r--r-- | packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseConstants.java | 4 |
2 files changed, 11 insertions, 10 deletions
diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java index c456be93d5a3..4c2c81fd9dad 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java @@ -557,13 +557,9 @@ class MtpDatabase { @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - if (oldVersion == 1) { - db.execSQL("DROP TABLE " + TABLE_DOCUMENTS); - db.execSQL("DROP TABLE " + TABLE_ROOT_EXTRA); - onCreate(db); - return; - } - throw new UnsupportedOperationException(); + db.execSQL("DROP TABLE " + TABLE_DOCUMENTS); + db.execSQL("DROP TABLE " + TABLE_ROOT_EXTRA); + onCreate(db); } } @@ -680,7 +676,12 @@ class MtpDatabase { if (formatCodeMimeType != null) { return formatCodeMimeType; } - return MediaFile.getMimeTypeForFile(info.getName()); + final String mediaFileMimeType = MediaFile.getMimeTypeForFile(info.getName()); + if (mediaFileMimeType != null) { + return mediaFileMimeType; + } + // We don't know the file type. + return "application/octet-stream"; } static String[] strings(Object... args) { diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseConstants.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseConstants.java index cb076af118b4..ab356ceba1c2 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseConstants.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabaseConstants.java @@ -30,7 +30,7 @@ import java.util.Map; * Class containing MtpDatabase constants. */ class MtpDatabaseConstants { - static final int DATABASE_VERSION = 2; + static final int DATABASE_VERSION = 3; static final String DATABASE_NAME = "database"; static final int FLAG_DATABASE_IN_MEMORY = 1; @@ -125,7 +125,7 @@ class MtpDatabaseConstants { COLUMN_PARENT_DOCUMENT_ID + " INTEGER," + COLUMN_ROW_STATE + " INTEGER NOT NULL," + COLUMN_DOCUMENT_TYPE + " INTEGER NOT NULL," + - Document.COLUMN_MIME_TYPE + " TEXT," + + Document.COLUMN_MIME_TYPE + " TEXT NOT NULL," + Document.COLUMN_DISPLAY_NAME + " TEXT NOT NULL," + Document.COLUMN_SUMMARY + " TEXT," + Document.COLUMN_LAST_MODIFIED + " INTEGER," + |