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

Commit 04b9cab6 authored by Meng Wang's avatar Meng Wang Committed by Android (Google) Code Review
Browse files

Merge "Define permission GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS"

parents 66b1e081 b3d449b8

api/system-current.txt

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

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

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

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

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

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

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -2006,6 +2006,11 @@ 
    <!-- =========================================== -->

    <!-- =========================================== -->

    <eat-comment />

    <eat-comment />





    <!-- @SystemApi Allows granting runtime permissions to telephony related components.

         @hide Used internally. -->

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

        android:protectionLevel="signature|telephony" />



    <!-- Allows modification of the telephony state - power on, mmi, etc.

    <!-- Allows modification of the telephony state - power on, mmi, etc.

         Does not include placing calls.

         Does not include placing calls.

         <p>Not for use by third-party applications. -->

         <p>Not for use by third-party applications. -->