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

Commit aa53e081 authored by James Mattis's avatar James Mattis Committed by Automerger Merge Worker
Browse files

Merge "Adding permission READ_SUBSCRIPTION_PLANS" into main am: f848df33 

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



Change-Id: I22e81954359aeab16d43231580de0593faa713d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 56427a64 f848df33

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ package android { 
    field public static final String READ_RUNTIME_PROFILES = "android.permission.READ_RUNTIME_PROFILES";

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

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

    field @FlaggedApi("com.android.internal.telephony.flags.subscription_plan_allow_status_and_end_date") public static final String READ_SUBSCRIPTION_PLANS = "android.permission.READ_SUBSCRIPTION_PLANS";

    field @FlaggedApi("android.app.system_terms_of_address_enabled") public static final String READ_SYSTEM_GRAMMATICAL_GENDER = "android.permission.READ_SYSTEM_GRAMMATICAL_GENDER";

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

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

core/res/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ android_app { 
        "android.media.tv.flags-aconfig",

        "com.android.hardware.input.input-aconfig",

        "ranging_aconfig_flags",

        "telephony_flags",

    ],

}

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -6828,6 +6828,13 @@ 
    <permission android:name="android.permission.MANAGE_SUBSCRIPTION_PLANS"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi @hide Allows for reading subscription plan fields for status and end date.

         @FlaggedApi(com.android.internal.telephony.flags.Flags.FLAG_SUBSCRIPTION_PLAN_ALLOW_STATUS_AND_END_DATE)

    -->

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

        android:protectionLevel="signature|privileged"

        android:featureFlag="com.android.internal.telephony.flags.subscription_plan_allow_status_and_end_date" />



    <!-- C2DM permission.

         @hide Used internally.

     -->