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

Commit e45a5d0d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add new permission to access eSE" am: 13631a1f am: f4801841 

Change-Id: I16822fd1b347452cfc1e03255683e97bf43fddb2
parents 918344d4 f4801841

api/system-current.txt

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

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

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

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

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

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

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -1781,6 +1781,11 @@ 
        android:label="@string/permlab_preferredPaymentInfo"

        android:label="@string/permlab_preferredPaymentInfo"

        android:protectionLevel="normal" />

        android:protectionLevel="normal" />





    <!-- @SystemApi Allows an internal user to use privileged SecureElement APIs.

         @hide -->

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

        android:protectionLevel="signature|privileged" />



    <!-- @deprecated This permission used to allow too broad access to sensitive methods and all its

    <!-- @deprecated This permission used to allow too broad access to sensitive methods and all its

         uses have been replaced by a more appropriate permission. Most uses have been replaced with

         uses have been replaced by a more appropriate permission. Most uses have been replaced with

         a NETWORK_STACK or NETWORK_SETTINGS check. Please look up the documentation of the

         a NETWORK_STACK or NETWORK_SETTINGS check. Please look up the documentation of the