Append separator to avoid common prefix match

We should match against "/storage/foo/" instead of "/storage/foo", in case
there is a path that is a prefix of the other.

Change-Id: If6cda18768039a130dfb81dd402ac4ce7b26a2a7

1 files changed, 7 insertions, 3 deletions

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 8af0ac48..974b0dd6 100755
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -131,9 +131,13 @@ public class MediaProvider extends ContentProvider {
 
     static {
         try {
-            sExternalPath = Environment.getExternalStorageDirectory().getCanonicalPath();
-            sCachePath = Environment.getDownloadCacheDirectory().getCanonicalPath();
-            sLegacyPath = Environment.getLegacyExternalStorageDirectory().getCanonicalPath();
+            sExternalPath =
+                    Environment.getExternalStorageDirectory().getCanonicalPath() + File.separator;
+            sCachePath =
+                    Environment.getDownloadCacheDirectory().getCanonicalPath() + File.separator;
+            sLegacyPath =
+                    Environment.getLegacyExternalStorageDirectory().getCanonicalPath()
+                    + File.separator;
         } catch (IOException e) {
             throw new RuntimeException("Unable to resolve canonical paths", e);
         }