Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 120715a5 authored by Raman Tenneti's avatar Raman Tenneti Committed by android-build-merger
Browse files

Merge "Wait until any background events are processed." into stage-aosp-master am: 05893253 

am: 8cf1cab8

Change-Id: I7648fba978a44d421021e4a7e4a821ebf3ef4b38
parents ecb319ce 8cf1cab8

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2326,6 +2326,7 @@ package android.provider { 
    method public static android.net.Uri scanFile(android.content.Context, java.io.File);

    method public static android.net.Uri scanFileFromShell(android.content.Context, java.io.File);

    method public static void scanVolume(android.content.Context, java.io.File);

    method public static void waitForIdle(android.content.Context);

  }



  public final class Settings {

core/java/android/provider/MediaStore.java

+13 −0
Original line number Diff line number Diff line
@@ -136,6 +136,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} */
@@ -3560,6 +3562,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) {