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

Commit 993b3ed5 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Structure MediaProvider as an APEX."

parents 996e6d1d 5fceb157

core/java/android/provider/MediaStore.java

+12 −0
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ public final class MediaStore { 
    public static final String SCAN_FILE_CALL = "scan_file";

    /** {@hide} */

    public static final String SCAN_VOLUME_CALL = "scan_volume";

    /** {@hide} */

    public static final String SUICIDE_CALL = "suicide";



    /**

     * Extra used with {@link #SCAN_FILE_CALL} or {@link #SCAN_VOLUME_CALL} to indicate that
@@ -3979,6 +3981,16 @@ public final class MediaStore { 
        }

    }



    /** @hide */

    public static void suicide(Context context) {

        final ContentResolver resolver = context.getContentResolver();

        try (ContentProviderClient client = resolver

                .acquireUnstableContentProviderClient(AUTHORITY)) {

            client.call(SUICIDE_CALL, null, null);

        } catch (Exception ignored) {

        }

    }



    /** @hide */

    @TestApi

    public static Uri scanFile(Context context, File file) {

data/etc/privapp-permissions-platform.xml

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ applications that come with the platform 
        <permission name="android.permission.UPDATE_DEVICE_STATS"/>

    </privapp-permissions>



    <privapp-permissions package="com.android.providers.media">

    <privapp-permissions package="com.android.providers.media.module">

        <permission name="android.permission.INTERACT_ACROSS_USERS"/>

        <permission name="android.permission.MANAGE_USERS"/>

        <permission name="android.permission.USE_RESERVED_DISK"/>