commit dd3b630823dc40a54b32940569803974422e49df
author Marco Nelissen <marcone@google.com> Thu Aug 02 10:23:05 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 02 10:23:05 2012 -0700
tree eaf35b517fde59c2a7404d3147905dc0bb239613
parent e973d114352824b6bbce6e5e70cb2e5e7059b898
parent 34d6cfab3faf234d36ac3da63dcc50ef3d5fc1a5

Merge "Only set file size if the app didn't"

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 3434089..4d9f242 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -2976,7 +2976,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());
+                    }
                 }
             }