diff options
| author | Raman Tenneti <rtenneti@google.com> | 2019-08-21 12:50:16 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-21 12:50:16 -0700 |
| commit | 1117253913047c86b07d1d45a1de75481e3bfccd (patch) | |
| tree | 936816262d437934daffffde0a307acfe9878a91 /core/java/android | |
| parent | 83f996382dbd1fcddc68352097f7621abdab0c1f (diff) | |
| parent | 120715a56baf04e2371dbf3e04c4ec19d2ef72b9 (diff) | |
Merge "Wait until any background events are processed." into stage-aosp-master am: 0589325300 am: 8cf1cab8c4
am: 120715a56b
Change-Id: I1a0a379061ba3e2d79d1f0600a400167ae8c74eb
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index 2a590ce5a65e..2299aad6f79a 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -137,6 +137,8 @@ public final class MediaStore { public static final String VOLUME_EXTERNAL_PRIMARY = "external_primary"; /** {@hide} */ + public static final String WAIT_FOR_IDLE_CALL = "wait_for_idle"; + /** {@hide} */ public static final String SCAN_FILE_CALL = "scan_file"; /** {@hide} */ public static final String SCAN_VOLUME_CALL = "scan_volume"; @@ -3562,6 +3564,17 @@ public final class MediaStore { /** @hide */ @TestApi + public static void waitForIdle(Context context) { + final ContentResolver resolver = context.getContentResolver(); + try (ContentProviderClient client = resolver.acquireContentProviderClient(AUTHORITY)) { + client.call(WAIT_FOR_IDLE_CALL, null, null); + } catch (RemoteException e) { + throw e.rethrowAsRuntimeException(); + } + } + + /** @hide */ + @TestApi public static Uri scanFile(Context context, File file) { return scan(context, SCAN_FILE_CALL, file, false); } |