commit 9eb770968bfc9f5062367b34e5ce16bec40f6834
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 23 21:07:34 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 23 21:07:34 2016 +0000
tree d8dee8aacad3a8eab5256b218619994ff322611a
parent dcf39572ca226635c18af2f06b0e2bd008ce9ba0
parent 5648f1326b96a70b37206227d20dcc2147938c14

Merge "Rescan files from sdcard when removing nomedia"

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 388997f..74edd6b 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -3730,10 +3730,15 @@
         // a nomedia path was removed, so clear the nomedia paths
         MediaScanner.clearMediaPathCache(false /* media */, true /* nomedia */);
         final DatabaseHelper helper;
-        if (path.startsWith(mExternalStoragePaths[0])) {
-            helper = getDatabaseForUri(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI);
-        } else {
+        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);
         }
         SQLiteDatabase db = helper.getWritableDatabase();
         new ScannerClient(getContext(), db, path);