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

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

Merge changes from topic "legacycodez" 

* changes:
  Progress towards splitting MediaProvider UID.
  Progress towards splitting MediaProvider UID.
parents 33f50a8a 7e9699f8

core/java/android/provider/MediaStore.java

+26 −5
Original line number Diff line number Diff line
@@ -104,7 +104,14 @@ public final class MediaStore { 
    /** The authority for the media provider */

    public static final String AUTHORITY = "media";

    /** A content:// style uri to the authority for the media provider */

    public static final @NonNull Uri AUTHORITY_URI = Uri.parse("content://" + AUTHORITY);

    public static final @NonNull Uri AUTHORITY_URI =

            Uri.parse("content://" + AUTHORITY);



    /** @hide */

    public static final String AUTHORITY_LEGACY = "media_legacy";

    /** @hide */

    public static final @NonNull Uri AUTHORITY_LEGACY_URI =

            Uri.parse("content://" + AUTHORITY_LEGACY);



    /**

     * Synthetic volume name that provides a view of all content across the
@@ -877,6 +884,16 @@ public final class MediaStore { 
        context.getContentResolver().update(uri, values, null, null);

    }



    /**

     * Rewrite the given {@link Uri} to point at

     * {@link MediaStore#AUTHORITY_LEGACY}.

     *

     * @hide

     */

    public static @NonNull Uri rewriteToLegacy(@NonNull Uri uri) {

        return uri.buildUpon().authority(MediaStore.AUTHORITY_LEGACY).build();

    }



    /**

     * Common media metadata columns.

     */
@@ -3477,12 +3494,16 @@ public final class MediaStore { 
     */

    public static @NonNull String getVolumeName(@NonNull Uri uri) {

        final List<String> segments = uri.getPathSegments();

        if (uri.getAuthority().equals(AUTHORITY) && segments != null && segments.size() > 0) {

        switch (uri.getAuthority()) {

            case AUTHORITY:

            case AUTHORITY_LEGACY: {

                if (segments != null && segments.size() > 0) {

                    return segments.get(0);

        } else {

            throw new IllegalArgumentException("Missing volume name: " + uri);

                }

            }

        }

        throw new IllegalArgumentException("Missing volume name: " + uri);

    }



    /** {@hide} */

    public static @NonNull String checkArgumentVolumeName(@NonNull String volumeName) {

data/etc/privapp-permissions-platform.xml

+4 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ applications that come with the platform 
    <privapp-permissions package="com.android.mtp">

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

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

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

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

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

    </privapp-permissions>



    <privapp-permissions package="com.android.musicfx">
@@ -207,6 +210,7 @@ applications that come with the platform 
        <permission name="android.permission.USE_RESERVED_DISK"/>

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

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

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

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

    </privapp-permissions>