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

Commit 0e92f936 authored by Grace Cheng's avatar Grace Cheng
Browse files

Add permissions for secure lock device feature 

Flag: android.security.secure_lockdown
API-Coverage-Bug: 376456619
Bug: 373422357
Test: N/A
Change-Id: Ib2ac72f94026da39e77c6f15754d24e3a4bf3684
parent f5f93a37

core/api/system-current.txt

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

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

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

    field @FlaggedApi("android.security.secure_lockdown") public static final String MANAGE_SECURE_LOCK_DEVICE = "android.permission.MANAGE_SECURE_LOCK_DEVICE";

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

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

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

core/res/AndroidManifest.xml

+11 −0
Original line number Diff line number Diff line
@@ -8651,6 +8651,17 @@ 
    <permission android:name="android.permission.SETUP_FSVERITY"

                android:protectionLevel="signature|privileged"/>



    <!-- @SystemApi

        @FlaggedApi(android.security.Flags.FLAG_SECURE_LOCKDOWN)

        Allows an application to lock down the device into an enhanced security state.

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

        <p>Protection level: signature|privileged

        @hide

    -->

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

        android:protectionLevel="signature|privileged"

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



    <!-- Allows app to enter trade-in-mode.

        <p>Protection level: signature|privileged

        @hide

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Diff line number Diff line
@@ -533,6 +533,8 @@ applications that come with the platform 
        <permission name="com.android.cellbroadcastservice.FULL_ACCESS_CELL_BROADCAST_HISTORY" />

        <!-- Permission required for ATS test - CarDevicePolicyManagerTest -->

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

        <!-- Permission required for AuthenticationPolicyManagerTest -->

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

        <!-- Permissions required for CTS test - CtsSafetyCenterTestCases -->

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

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

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -746,6 +746,9 @@ 
    <!-- Permission required for ATS test - CarDevicePolicyManagerTest -->

    <uses-permission android:name="android.permission.LOCK_DEVICE" />



    <!-- Permission required for AuthenticationPolicyManagerTest -->

    <uses-permission android:name="android.permission.MANAGE_SECURE_LOCK_DEVICE" />



    <!-- Permissions required for CTS test - CtsSafetyCenterTestCases -->

    <uses-permission android:name="android.permission.SEND_SAFETY_CENTER_UPDATE" />

    <uses-permission android:name="android.permission.READ_SAFETY_CENTER_STATUS" />