commit f3c21afdbd31a2d94156145e3a699934551e0e63
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 16 10:42:12 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 16 10:42:12 2020 +0000
tree d02ce1eca2a59bfef03339fd35f1c56d9ecdb9d4
parent 604474d55c32b9261d85fa25cedeb38febbacd3b
parent 1597e9f2af320317b9bba70f358d02b411072d8a

Merge "Don't overwrite is_download column" into rvc-dev

src/com/android/providers/media/util/FileUtils.java

diff --git a/src/com/android/providers/media/util/FileUtils.java b/src/com/android/providers/media/util/FileUtils.java
index d0e71e3..78f2c6f 100644
--- a/src/com/android/providers/media/util/FileUtils.java
+++ b/src/com/android/providers/media/util/FileUtils.java
@@ -986,7 +986,6 @@
         // Worst case we have to assume no bucket details
         values.remove(MediaColumns.VOLUME_NAME);
         values.remove(MediaColumns.RELATIVE_PATH);
-        values.remove(MediaColumns.IS_DOWNLOAD);
         values.remove(MediaColumns.IS_PENDING);
         values.remove(MediaColumns.IS_TRASHED);
         values.remove(MediaColumns.DATE_EXPIRES);
@@ -1002,8 +1001,6 @@
 
         values.put(MediaColumns.VOLUME_NAME, extractVolumeName(data));
         values.put(MediaColumns.RELATIVE_PATH, extractRelativePath(data));
-        values.put(MediaColumns.IS_DOWNLOAD, isDownload(data));
-
         final String displayName = extractDisplayName(data);
         final Matcher matcher = FileUtils.PATTERN_EXPIRES_FILE.matcher(displayName);
         if (matcher.matches()) {