commit c6245b5680ba03693a5fb0a577be92b8370c99e3
author Marco Nelissen <marcone@google.com> Wed Sep 28 23:35:25 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 28 23:35:25 2016 +0000
tree 39a1290fde931518fe4f5e894acb0e51ea601fa9
parent 3cf3ce80d4581b71f491aba09c9a42daf1d39e1a
parent b05734a4b34625ebb46eb4d953105957bc891708

Don't insert entries with trailing slash am: 759a9b745a
am: b05734a4b3

Change-Id: I7f26c2915d96ac1a6839dd7404f2048977046ba7

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) {