summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-03-21 16:38:45 -0700
committerJeff Sharkey <jsharkey@android.com>2015-03-30 16:18:21 -0700
commit8c744c41bc23d6c10b3de5fe5fc85fd4bab64ad6 (patch)
treee052ff9a3b6d1737cde9a51c66f3b8ddd960b00f
parente3eb97cdd8b2cf72d40e163fe7dd26d65e7ceaab (diff)
downloadandroid_packages_providers_MediaProvider-8c744c41bc23d6c10b3de5fe5fc85fd4bab64ad6.tar.gz
android_packages_providers_MediaProvider-8c744c41bc23d6c10b3de5fe5fc85fd4bab64ad6.tar.bz2
android_packages_providers_MediaProvider-8c744c41bc23d6c10b3de5fe5fc85fd4bab64ad6.zip
Follow MtpStorage refactoring.
Bug: 19993667 Change-Id: I6380ac08f2eb91af81277d0ace42943e20112b2d
-rwxr-xr-xsrc/com/android/providers/media/MediaProvider.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 0e8259bd..7d0277bc 100755
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -1622,7 +1622,7 @@ public class MediaProvider extends ContentProvider {
// Add column for MTP storage ID
db.execSQL("ALTER TABLE files ADD COLUMN storage_id INTEGER;");
// Anything in the database before this upgrade step will be in the primary storage
- db.execSQL("UPDATE files SET storage_id=" + MtpStorage.getStorageId(0) + ";");
+ db.execSQL("UPDATE files SET storage_id=" + MtpStorage.getStorageIdForIndex(0) + ";");
}
if (fromVersion < 403 && !internal) {
@@ -3019,12 +3019,12 @@ public class MediaProvider extends ContentProvider {
if (path.startsWith(test)) {
int length = test.length();
if (path.length() == length || path.charAt(length) == '/') {
- return MtpStorage.getStorageId(i);
+ return MtpStorage.getStorageIdForIndex(i);
}
}
}
// default to primary storage
- return MtpStorage.getStorageId(0);
+ return MtpStorage.getStorageIdForIndex(0);
}
private long insertFile(DatabaseHelper helper, Uri uri, ContentValues initialValues, int mediaType,