Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Migrate MediaScannerConnection to using call()."

Browse Source
This commit is contained in:
Jeff Sharkey
2019-08-20 00:29:26 +00:00
committed by Android (Google) Code Review
parent 9cdb3cdbb8 aac9878b43
commit 570926daef
2 changed files with 112 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/provider/MediaStore.java
View File

@@ -3591,11 +3591,24 @@ public final class MediaStore {
scan(context, SCAN_VOLUME_CALL, file, false);
}
/** @hide */
public static Uri scanFile(ContentProviderClient client, File file) {
return scan(client, SCAN_FILE_CALL, file, false);
}
/** @hide */
private static Uri scan(Context context, String method, File file,
boolean originatedFromShell) {
final ContentResolver resolver = context.getContentResolver();
try (ContentProviderClient client = resolver.acquireContentProviderClient(AUTHORITY)) {
return scan(client, method, file, originatedFromShell);
}
}
/** @hide */
private static Uri scan(ContentProviderClient client, String method, File file,
boolean originatedFromShell) {
try {
final Bundle in = new Bundle();
in.putParcelable(Intent.EXTRA_STREAM, Uri.fromFile(file));
in.putBoolean(EXTRA_ORIGINATED_FROM_SHELL, originatedFromShell);