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

Commit a9233e79 authored by Jay Sullivan's avatar Jay Sullivan Committed by Android (Google) Code Review
Browse files

Merge "[ECM] Create MANAGE_ENHANCED_CONFIRMATION_STATES permission" into main

parents e93c5c2c 2202f1b6

core/api/system-current.txt

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

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

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

    field @FlaggedApi("android.permission.flags.enhanced_confirmation_mode_apis_enabled") public static final String MANAGE_ENHANCED_CONFIRMATION_STATES = "android.permission.MANAGE_ENHANCED_CONFIRMATION_STATES";

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

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

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

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -3775,6 +3775,13 @@ 
    <permission android:name="android.permission.MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL"

                android:protectionLevel="internal|role" />



    <!-- Allows an application to access EnhancedConfirmationManager.

        @SystemApi

        @FlaggedApi("android.permission.flags.enhanced_confirmation_mode_apis_enabled")

        @hide This is not a third-party API (intended for OEMs and system apps). -->

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

                android:protectionLevel="signature|installer" />



    <!-- @SystemApi @hide Allows an application to set a device owner on retail demo devices.-->

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

                android:protectionLevel="signature|setup|knownSigner"