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

Commit f30a25e7 authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

Merge "Add policy identifier for device policy API" into main

parents 680a68fa a328b588

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7955,6 +7955,7 @@ package android.app.admin { 
    field public static final String LOCK_TASK_POLICY = "lockTask";

    field public static final String PACKAGES_SUSPENDED_POLICY = "packagesSuspended";

    field public static final String PACKAGE_UNINSTALL_BLOCKED_POLICY = "packageUninstallBlocked";

    field @FlaggedApi("android.app.admin.flags.policy_engine_migration_v2_enabled") public static final String PASSWORD_COMPLEXITY_POLICY = "passwordComplexity";

    field public static final String PERMISSION_GRANT_POLICY = "permissionGrant";

    field public static final String PERSISTENT_PREFERRED_ACTIVITY_POLICY = "persistentPreferredActivity";

    field public static final String RESET_PASSWORD_TOKEN_POLICY = "resetPasswordToken";

core/java/android/app/admin/DevicePolicyIdentifiers.java

+6 −0
Original line number Diff line number Diff line
@@ -181,6 +181,12 @@ public final class DevicePolicyIdentifiers { 
    @FlaggedApi(Flags.FLAG_POLICY_ENGINE_MIGRATION_V2_ENABLED)

    public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling";



    /**

     * String identifier for {@link DevicePolicyManager#setRequiredPasswordComplexity}.

     */

    @FlaggedApi(Flags.FLAG_POLICY_ENGINE_MIGRATION_V2_ENABLED)

    public static final String PASSWORD_COMPLEXITY_POLICY = "passwordComplexity";



    /**

     * @hide

     */