commit d89181d1feb8c0fc198424d77c8275e7cab7b97c
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 28 23:27:49 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 28 23:27:50 2016 +0000
tree 5860c6c5605311273f9aad635abc1476bf9e84cd
parent 8247cc4dcca29ef976fe990dfaaadfa309a5697f
parent 759a9b745a25143168cd589b358a490553aa041f

Merge "Don't insert entries with trailing slash" into nyc-mr1-dev

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 80ea398..aa8cd88 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -3214,6 +3214,10 @@
                 format = MediaFile.getFormatCode(path, mimeType);
             }
         }
+        if (path.endsWith("/")) {
+            Log.e(TAG, "directory has trailing slash: " + path);
+            return 0;
+        }
         if (format != 0) {
             values.put(FileColumns.FORMAT, format);
             if (mimeType == null) {