commit 68e1c22d854abe268f387f59cb4bfa9a590a013c
author Jeff Sharkey <jsharkey@android.com> Wed Sep 19 15:20:28 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 19 15:20:28 2012 -0700
tree e0fedb61121b701217f0c5d0950a71b8cb8b8c28
parent 072c88ab3f091020b757220df3fdbddedd57f18c
parent 96ed5dcd7f84926c1224914a4ad25f94a722d245

am 96ed5dcd: am 6d1fac3d: Merge "Update buckets after path changes." into jb-mr1-dev

* commit '96ed5dcd7f84926c1224914a4ad25f94a722d245':
  Update buckets after path changes.

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 607dc8d..038380c 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -3004,7 +3004,9 @@
                 File file = new File(path);
                 if (file.exists()) {
                     values.put(FileColumns.DATE_MODIFIED, file.lastModified() / 1000);
-                    values.put(FileColumns.SIZE, file.length());
+                    if (!values.containsKey(FileColumns.SIZE)) {
+                        values.put(FileColumns.SIZE, file.length());
+                    }
                 }
             }