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

Merge "Rename READ_MEDIA_IMAGE to READ_MEDIA_IMAGES" into tm-dev am: 64e22982b0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17147920

Change-Id: I5167e2c9b2dfcaae8e00d6ed5da100236ef4f7f8
This commit is contained in:
Corina Grigoras
2022-03-10 22:03:05 +00:00
committed by Automerger Merge Worker
parent 6ac64a8d6e 64e22982b0
commit 54b74fb609
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -142,7 +142,7 @@ package android {
field @Deprecated public static final String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE"; field @Deprecated public static final String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE";
field public static final String READ_LOGS = "android.permission.READ_LOGS"; field public static final String READ_LOGS = "android.permission.READ_LOGS";
field public static final String READ_MEDIA_AUDIO = "android.permission.READ_MEDIA_AUDIO"; field public static final String READ_MEDIA_AUDIO = "android.permission.READ_MEDIA_AUDIO";
field public static final String READ_MEDIA_IMAGE = "android.permission.READ_MEDIA_IMAGE"; field public static final String READ_MEDIA_IMAGES = "android.permission.READ_MEDIA_IMAGES";
field public static final String READ_MEDIA_VIDEO = "android.permission.READ_MEDIA_VIDEO"; field public static final String READ_MEDIA_VIDEO = "android.permission.READ_MEDIA_VIDEO";
field public static final String READ_NEARBY_STREAMING_POLICY = "android.permission.READ_NEARBY_STREAMING_POLICY"; field public static final String READ_NEARBY_STREAMING_POLICY = "android.permission.READ_NEARBY_STREAMING_POLICY";
field public static final String READ_PHONE_NUMBERS = "android.permission.READ_PHONE_NUMBERS"; field public static final String READ_PHONE_NUMBERS = "android.permission.READ_PHONE_NUMBERS";

2
core/java/android/app/AppOpsManager.java
View File

@@ -2367,7 +2367,7 @@ public class AppOpsManager {
null, // no permission for OP_WRITE_MEDIA_AUDIO null, // no permission for OP_WRITE_MEDIA_AUDIO
Manifest.permission.READ_MEDIA_VIDEO, Manifest.permission.READ_MEDIA_VIDEO,
null, // no permission for OP_WRITE_MEDIA_VIDEO null, // no permission for OP_WRITE_MEDIA_VIDEO
Manifest.permission.READ_MEDIA_IMAGE, Manifest.permission.READ_MEDIA_IMAGES,
null, // no permission for OP_WRITE_MEDIA_IMAGES null, // no permission for OP_WRITE_MEDIA_IMAGES
null, // no permission for OP_LEGACY_STORAGE null, // no permission for OP_LEGACY_STORAGE
null, // no permission for OP_ACCESS_ACCESSIBILITY null, // no permission for OP_ACCESS_ACCESSIBILITY

6
core/res/AndroidManifest.xml
View File

@@ -1030,10 +1030,10 @@
targetSdkVersion}</a> of {@link android.os.Build.VERSION_CODES#S} or lower, this permission targetSdkVersion}</a> of {@link android.os.Build.VERSION_CODES#S} or lower, this permission
must not be used and the READ_EXTERNAL_STORAGE permission must be used instead. must not be used and the READ_EXTERNAL_STORAGE permission must be used instead.
<p>Protection level: dangerous --> <p>Protection level: dangerous -->
<permission android:name="android.permission.READ_MEDIA_IMAGE" <permission android:name="android.permission.READ_MEDIA_IMAGES"
android:permissionGroup="android.permission-group.UNDEFINED" android:permissionGroup="android.permission-group.UNDEFINED"
android:label="@string/permlab_readMediaImage" android:label="@string/permlab_readMediaImages"
android:description="@string/permdesc_readMediaImage" android:description="@string/permdesc_readMediaImages"
android:protectionLevel="dangerous" /> android:protectionLevel="dangerous" />
<!-- Allows an application to write to external storage. <!-- Allows an application to write to external storage.

4
core/res/res/values/strings.xml
View File

@@ -1918,9 +1918,9 @@
<string name="permdesc_readMediaVideo">Allows the app to read video files from your shared storage.</string> <string name="permdesc_readMediaVideo">Allows the app to read video files from your shared storage.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. "shared storage" refers to a storage space on the device that all apps with this permission can read from. [CHAR LIMIT=none] --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. "shared storage" refers to a storage space on the device that all apps with this permission can read from. [CHAR LIMIT=none] -->
<string name="permlab_readMediaImage">read image files from shared storage</string> <string name="permlab_readMediaImages">read image files from shared storage</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. "shared storage" refers to a storage space on the device that all apps with this permission can read from. [CHAR LIMIT=none] --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. "shared storage" refers to a storage space on the device that all apps with this permission can read from. [CHAR LIMIT=none] -->
<string name="permdesc_readMediaImage">Allows the app to read image files from your shared storage.</string> <string name="permdesc_readMediaImages">Allows the app to read image files from your shared storage.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. "shared storage" refers to a storage space on the device that all apps with this permission can write to. [CHAR LIMIT=none] --> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. "shared storage" refers to a storage space on the device that all apps with this permission can write to. [CHAR LIMIT=none] -->
<string name="permlab_sdcardWrite">modify or delete the contents of your shared storage</string> <string name="permlab_sdcardWrite">modify or delete the contents of your shared storage</string>

2
data/etc/platform.xml
View File

@@ -241,7 +241,7 @@
</split-permission> </split-permission>
<split-permission name="android.permission.READ_EXTERNAL_STORAGE" <split-permission name="android.permission.READ_EXTERNAL_STORAGE"
targetSdk="33"> targetSdk="33">
<new-permission name="android.permission.READ_MEDIA_IMAGE" /> <new-permission name="android.permission.READ_MEDIA_IMAGES" />
</split-permission> </split-permission>
<split-permission name="android.permission.BLUETOOTH" <split-permission name="android.permission.BLUETOOTH"
targetSdk="31"> targetSdk="31">