Merge "Use MediaStore.scanFile instead of manually inserting to...

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;

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

        }

    }