commit 8bd4260d1b6c02252130f8c319ca6f4c3aed6297
author Jeff Sharkey <jsharkey@android.com> Wed Sep 19 10:26:52 2012 -0700
committer Jeff Sharkey <jsharkey@android.com> Wed Sep 19 10:26:52 2012 -0700
tree ef07d24112f644629117f6fce229e098fb2fa1ad
parent 8efd65fe64c7978534bb549b2329068a2f8c5075

Update buckets after path changes.

Bug: 7174672
Change-Id: Ib44a52ad337ca6df135955e71e6cec3261da780d

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f035150..c7e479c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
         package="com.android.providers.media"
         android:sharedUserId="android.media"
         android:sharedUserLabel="@string/uid_label"
-        android:versionCode="510">
+        android:versionCode="511">
         
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />

src/com/android/providers/media/MediaProvider.java

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 4566b0f..607dc8d 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -1746,6 +1746,10 @@
                         + "'||SUBSTR(_data,17) WHERE _data LIKE '/storage/sdcard0/%';");
             }
         }
+        if (fromVersion < 511) {
+            // we update _data in version 510, we need to update the bucket_id as well
+            updateBucketNames(db);
+        }
 
         sanityCheck(db, fromVersion);
         long elapsedSeconds = (SystemClock.currentTimeMicro() - startTime) / 1000000;