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

Commit 1a84caf2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "New permission to perform IMS RCS Reg actions" into sc-dev am: b34b3df2 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a7ecc94a41d3f7fc2f44197113b963ceb9d8c8f
parents ed924f54 b34b3df2

core/api/system-current.txt

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -1055,6 +1055,14 @@ 
        android:description="@string/permdesc_accessImsCallService"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi @hide Allows an application to perform IMS Single Registration related actions.

         Only granted if the application is a system app AND is in the Default SMS Role.

         The permission is revoked when the app is taken out of the Default SMS Role.

        <p>Protection level: internal|role

    -->

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

        android:protectionLevel="internal|role" />



    <!-- Allows an application to read the user's call log.

         <p class="note"><strong>Note:</strong> If your app uses the

         {@link #READ_CONTACTS} permission and <em>both</em> your <a