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

Commit cf63cdce authored by Nate Myren's avatar Nate Myren Committed by Android (Google) Code Review
Browse files

Merge "Add READ_MEDIA_VISUAL_USER_SELECTED to apps automatically"

parents eca2decb 5660b698

core/res/AndroidManifest.xml

+10 −2
Original line number Diff line number Diff line
@@ -1153,8 +1153,16 @@ 
    <!-- Allows an application to read image or video files from external storage that a user has

      selected via the permission prompt photo picker. Apps can check this permission to verify that

      a user has decided to use the photo picker, instead of granting access to

      {@link #READ_MEDIA_IMAGES or #READ_MEDIA_VIDEO}. It does not prevent apps from accessing the

      standard photo picker manually.

      {@link #READ_MEDIA_IMAGES} or {@link #READ_MEDIA_VIDEO}. It does not prevent apps from

      accessing the standard photo picker manually. This permission should be requested alongside

      {@link #READ_MEDIA_IMAGES} and/or {@link #READ_MEDIA_VIDEO}, depending on which type of media

      is desired.

      <p> This permission will be automatically added to an app's manifest if the app requests

      {@link #READ_MEDIA_IMAGES}, {@link #READ_MEDIA_VIDEO}, or {@link #ACCESS_MEDIA_LOCATION}

      regardless of target SDK. If an app does not request this permission, then the grant dialog

      will return `PERMISSION_GRANTED` for {@link #READ_MEDIA_IMAGES} and/or

      {@link #READ_MEDIA_VIDEO}, but the app will only have access to the media selected by the

      user. This false grant state will persist until the app goes into the background.

   <p>Protection level: dangerous -->

    <permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED"

        android:permissionGroup="android.permission-group.UNDEFINED"

data/etc/platform.xml

+9 −0
Original line number Diff line number Diff line
@@ -288,6 +288,15 @@ 
                      targetSdk="33">

        <new-permission name="android.permission.READ_MEDIA_IMAGES" />

    </split-permission>

    <split-permission name="android.permission.READ_MEDIA_IMAGES">

        <new-permission name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />

    </split-permission>

    <split-permission name="android.permission.READ_MEDIA_VIDEO">

        <new-permission name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />

    </split-permission>

    <split-permission name="android.permission.ACCESS_MEDIA_LOCATION">

        <new-permission name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />

    </split-permission>



    <!-- This is a list of all the libraries available for application

         code to link against. -->

services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 
        READ_MEDIA_VISUAL_PERMISSIONS.add(Manifest.permission.READ_MEDIA_VIDEO);

        READ_MEDIA_VISUAL_PERMISSIONS.add(Manifest.permission.READ_MEDIA_IMAGES);

        READ_MEDIA_VISUAL_PERMISSIONS.add(Manifest.permission.ACCESS_MEDIA_LOCATION);

        READ_MEDIA_VISUAL_PERMISSIONS.add(Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED);

        NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.BLUETOOTH_ADVERTISE);

        NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.BLUETOOTH_CONNECT);

        NEARBY_DEVICES_PERMISSIONS.add(Manifest.permission.BLUETOOTH_SCAN);