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

Commit cae41c40 authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Translate sandboxed paths correctly for MediaStore.SCAN_FILE_CALL. 

Bug: 123642484
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore_DownloadsTest.java
Change-Id: Ie19beb12e546b1b78e8e0d056558444a255f394d
parent 7d3adab5

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1756,6 +1756,7 @@ package android.provider { 
    method @RequiresPermission(android.Manifest.permission.CLEAR_APP_USER_DATA) public static long getContributedMediaSize(android.content.Context, String, android.os.UserHandle) throws java.io.IOException;

    method @NonNull public static java.io.File getVolumePath(@NonNull String) throws java.io.FileNotFoundException;

    method @NonNull public static java.util.Collection<java.io.File> getVolumeScanPaths(@NonNull String) throws java.io.FileNotFoundException;

    field public static final String EXTRA_ORIGINATED_FROM_SHELL = "android.intent.extra.originated_from_shell";

    field public static final String SCAN_FILE_CALL = "scan_file";

    field public static final String SCAN_VOLUME_CALL = "scan_volume";

  }

core/java/android/provider/MediaStore.java

+10 −0
Original line number Diff line number Diff line
@@ -109,6 +109,16 @@ public final class MediaStore { 
    /** {@hide} */ @TestApi

    public static final String SCAN_VOLUME_CALL = "scan_volume";



    /**

     * Extra used with {@link #SCAN_FILE_CALL} or {@link #SCAN_VOLUME_CALL} to indicate that

     * the file path originated from shell.

     *

     * {@hide}

     */

    @TestApi

    public static final String EXTRA_ORIGINATED_FROM_SHELL =

            "android.intent.extra.originated_from_shell";



    /**

     * The method name used by the media scanner and mtp to tell the media provider to

     * rescan and reclassify that have become unhidden because of renaming folders or