commit 26bcc0e5ae0361e489d321c57aa63150ae60b06b
author Sudheer Shanka <sudheersai@google.com> Fri Apr 19 15:57:38 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 19 15:57:38 2019 +0000
tree e5102c5cebaf8c49a537f918d4656b458de9b141
parent d1792d4bec9eaff32287785cce682149f9cfdc47
parent 74322a0e3b7f25038ae070eb60b2cb7491c9c2b7

Merge "Use MediaStore.scanFile instead of manually inserting to MediaProvider." into qt-dev

core/java/com/android/internal/content/FileSystemProvider.java

diff --git a/core/java/com/android/internal/content/FileSystemProvider.java b/core/java/com/android/internal/content/FileSystemProvider.java
index a7244a7..76826d3 100644
--- a/core/java/com/android/internal/content/FileSystemProvider.java
+++ b/core/java/com/android/internal/content/FileSystemProvider.java
@@ -19,7 +19,6 @@
 import android.annotation.CallSuper;
 import android.annotation.Nullable;
 import android.content.ContentResolver;
-import android.content.ContentValues;
 import android.content.Intent;
 import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
@@ -266,17 +265,7 @@
         if (visibleFolder != null) {
             assert (visibleFolder.isDirectory());
 
-            final long token = Binder.clearCallingIdentity();
-
-            try {
-                final ContentResolver resolver = getContext().getContentResolver();
-                final Uri uri = MediaStore.Files.getDirectoryUri("external");
-                ContentValues values = new ContentValues();
-                values.put(MediaStore.Files.FileColumns.DATA, visibleFolder.getAbsolutePath());
-                resolver.insert(uri, values);
-            } finally {
-                Binder.restoreCallingIdentity(token);
-            }
+            MediaStore.scanFile(getContext(), visibleFolder);
         }
     }