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

Commit 54b74fb6 authored by Corina Grigoras's avatar Corina Grigoras Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I5167e2c9b2dfcaae8e00d6ed5da100236ef4f7f8
parents 6ac64a8d 64e22982

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ package android { 
    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_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_NEARBY_STREAMING_POLICY = "android.permission.READ_NEARBY_STREAMING_POLICY";

    field public static final String READ_PHONE_NUMBERS = "android.permission.READ_PHONE_NUMBERS";

core/java/android/app/AppOpsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -2367,7 +2367,7 @@ public class AppOpsManager { 
            null, // no permission for OP_WRITE_MEDIA_AUDIO

            Manifest.permission.READ_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_LEGACY_STORAGE

            null, // no permission for OP_ACCESS_ACCESSIBILITY

core/res/AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -1030,10 +1030,10 @@ 
      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.

     <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:label="@string/permlab_readMediaImage"

                android:description="@string/permdesc_readMediaImage"

                android:label="@string/permlab_readMediaImages"

                android:description="@string/permdesc_readMediaImages"

                android:protectionLevel="dangerous" />



    <!-- Allows an application to write to external storage.

core/res/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -1918,9 +1918,9 @@ 
    <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] -->

    <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] -->

    <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] -->

    <string name="permlab_sdcardWrite">modify or delete the contents of your shared storage</string>

data/etc/platform.xml

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ 
    </split-permission>

    <split-permission name="android.permission.READ_EXTERNAL_STORAGE"

                      targetSdk="33">

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

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

    </split-permission>

    <split-permission name="android.permission.BLUETOOTH"

                      targetSdk="31">