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

Commit 1c4ccb8e authored by Michael Groover's avatar Michael Groover Committed by Android (Google) Code Review
Browse files

Merge changes from topic "SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE-privileged-flag" into main 

* changes:
  Update privapp-permissions for shell and systemui
  Add privileged flag to SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE
parents 98ecee97 7654ac72

core/java/android/security/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -138,3 +138,11 @@ flag { 
    bug: "373422357"

    is_exported: true

}



flag {

    name: "subscribe_to_keyguard_locked_state_perm_priv_flag"

    namespace: "psap_ai"

    description: "Feature flag to add the privileged flag to the SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE permission"

    bug: "380120712"

    is_fixed_read_only: true

}
 
 No newline at end of file

core/res/AndroidManifest.xml

+13 −3
Original line number Diff line number Diff line
@@ -5648,11 +5648,21 @@ 


    <!-- Allows an application to subscribe to device locked and keyguard locked (i.e., showing)

        state.

         <p>Protection level: signature|role

         <p>Intended for use by ROLE_ASSISTANT and signature apps only.

         <p>Protection level: signature|module|role

         <p>Intended for use by ROLE_ASSISTANT, VDM, and signature apps only.

    -->

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

                android:protectionLevel="signature|module|role"

                android:featureFlag="!android.security.subscribe_to_keyguard_locked_state_perm_priv_flag"/>



    <!-- Allows an application to subscribe to device locked and keyguard locked (i.e., showing)

        state.

         <p>Protection level: signature|privileged|module|role

         <p>Intended for use by ROLE_ASSISTANT, VDM, and signature / privileged apps only.

    -->

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

                android:protectionLevel="signature|module|role"/>

                android:protectionLevel="signature|privileged|module|role"

                android:featureFlag="android.security.subscribe_to_keyguard_locked_state_perm_priv_flag"/>



    <!-- Must be required by a {@link android.service.autofill.AutofillService},

         to ensure that only the system can bind to it.

data/etc/com.android.systemui.xml

+1 −0
Original line number Diff line number Diff line
@@ -94,5 +94,6 @@ 
        <permission name="android.permission.CONTROL_UI_TRACING" />

        <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND" />

        <permission name="android.permission.OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW"/>

        <permission name="android.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE" />

    </privapp-permissions>

</permissions>

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Diff line number Diff line
@@ -607,6 +607,8 @@ applications that come with the platform 
        <!-- Permission required for CTS test - IntrusionDetectionManagerTest -->

        <permission name="android.permission.READ_INTRUSION_DETECTION_STATE" />

        <permission name="android.permission.MANAGE_INTRUSION_DETECTION_STATE" />

        <!-- Permission required for CTS test - KeyguardLockedStateApiTest -->

        <permission name="android.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE" />

    </privapp-permissions>



    <privapp-permissions package="com.android.statementservice">