diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 8f3b54b..279c1ac 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -2918,16 +2918,7 @@
         // a nomedia path was removed, so clear the nomedia paths
         MediaScanner.clearMediaPathCache(false /* media */, true /* nomedia */);
         final DatabaseHelper helper;
-        String[] internalPaths = new String[] {
-            Environment.getRootDirectory() + "/media",
-            Environment.getOemDirectory() + "/media",
-        };
-
-        if (path.startsWith(internalPaths[0]) || path.startsWith(internalPaths[1])) {
-            helper = getDatabaseForUri(MediaStore.Audio.Media.INTERNAL_CONTENT_URI);
-        } else {
-            helper = getDatabaseForUri(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI);
-        }
+        helper = getDatabaseForUri(MediaStore.Audio.Media.getContentUriForPath(path));
         SQLiteDatabase db = helper.getWritableDatabase();
         new ScannerClient(getContext(), db, path);
     }
