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

Commit 50e74f1e authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Jeff Sharkey
Browse files

Migrate CTS to separate broadcast to scan volume. 

It can't sent MEDIA_MOUNTED via the shell, so let's use a separate
broadcast.  Also improve robustness of several tests.

Bug: 123251175
Test: atest cts/tests/tests/media/src/android/media/cts/MediaScanner*
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: I5b0f07c817b18175c6e427729a9fa0545f6bcd8e
parent dab8059a

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10221,6 +10221,7 @@ package android.content { 
    field public static final String ACTION_MEDIA_REMOVED = "android.intent.action.MEDIA_REMOVED";

    field public static final String ACTION_MEDIA_SCANNER_FINISHED = "android.intent.action.MEDIA_SCANNER_FINISHED";

    field public static final String ACTION_MEDIA_SCANNER_SCAN_FILE = "android.intent.action.MEDIA_SCANNER_SCAN_FILE";

    field public static final String ACTION_MEDIA_SCANNER_SCAN_VOLUME = "android.intent.action.MEDIA_SCANNER_SCAN_VOLUME";

    field public static final String ACTION_MEDIA_SCANNER_STARTED = "android.intent.action.MEDIA_SCANNER_STARTED";

    field public static final String ACTION_MEDIA_SHARED = "android.intent.action.MEDIA_SHARED";

    field public static final String ACTION_MEDIA_UNMOUNTABLE = "android.intent.action.MEDIA_UNMOUNTABLE";

core/java/android/content/Intent.java

+7 −0
Original line number Diff line number Diff line
@@ -3047,6 +3047,13 @@ public class Intent implements Parcelable, Cloneable { 
    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_MEDIA_SCANNER_SCAN_FILE = "android.intent.action.MEDIA_SCANNER_SCAN_FILE";



    /**

     * Broadcast Action:  Request the media scanner to scan a storage volume and add it to the media database.

     * The path to the storage volume is contained in the Intent.mData field.

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_MEDIA_SCANNER_SCAN_VOLUME = "android.intent.action.MEDIA_SCANNER_SCAN_VOLUME";



   /**

     * Broadcast Action:  The "Media Button" was pressed.  Includes a single

     * extra field, {@link #EXTRA_KEY_EVENT}, containing the key event that