Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add READ_MEDIA_VISUAL_USER_SELECTED to apps automatically"

Browse Source
This commit is contained in:
Nate Myren
2022-11-18 00:38:30 +00:00
committed by Android (Google) Code Review
parent eca2decb9a 5660b698eb
commit cf63cdce77
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/res/AndroidManifest.xml
View File

@@ -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"

9
data/etc/platform.xml
View File

@@ -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. -->

1
services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
View File

@@ -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);