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

Commit 7bb38dbb authored by Ido Ofir's avatar Ido Ofir Committed by Android (Google) Code Review
Browse files

Merge "Adding permission for launching the trust agent settings."

parents a0f0c783 29372ab4
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -2663,6 +2663,13 @@
                android:label="@string/permlab_provide_trust_agent"
                android:description="@string/permdesc_provide_trust_agent" />

    <!-- Allows an application to launch the trust agent settings activity.
        @hide -->
    <permission android:name="android.permission.LAUNCH_TRUST_AGENT_SETTINGS"
        android:protectionLevel="signatureOrSystem"
        android:label="@string/permlab_launch_trust_agent_settings"
        android:description="@string/permdesc_launch_trust_agent_settings" />

    <!-- Must be required by an {@link
         android.service.trust.TrustAgentService},
         to ensure that only the system can bind to it. -->
+2 −0
Original line number Diff line number Diff line
@@ -3795,6 +3795,8 @@
    <string name="permlab_provide_trust_agent">Provide a trust agent.</string>
    <!-- Description of an application permission that lets it provide a trust agent. -->
    <string name="permdesc_provide_trust_agent">Allows an application to provide a trust agent.</string>
    <string name="permlab_launch_trust_agent_settings">Lunch trust agent settings menu.</string>
    <string name="permdesc_launch_trust_agent_settings">Allows an application to lunch an activity that changes the trust agent behavior.</string>

    <!-- Title of an application permission that lets it bind to a trust agent service. -->
    <string name="permlab_bind_trust_agent_service">Bind to a trust agent service</string>