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

Commit c418d5ad authored by Rubin Xu's avatar Rubin Xu
Browse files

Allow profile owner to disable iris/face on personal keyguard 

This is similar to their existing capability of disabling fingerprint
on personal keyguard.

Bug: 78449641
Test: builds
Change-Id: Ia1d6a40a3ff30366af52435ad51c44a9f7612304
parent f050932e

core/java/android/app/admin/DevicePolicyManager.java

+11 −5
Original line number Original line Diff line number Diff line
@@ -3711,7 +3711,7 @@ public class DevicePolicyManager { 
     */

     */

    public static final int PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER =

    public static final int PROFILE_KEYGUARD_FEATURES_AFFECT_OWNER =

            DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS

            DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS

            | DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT;

            | DevicePolicyManager.KEYGUARD_DISABLE_BIOMETRICS;





    /**

    /**

     * Called by an application that is administering the device to request that the storage system

     * Called by an application that is administering the device to request that the storage system
@@ -4724,12 +4724,14 @@ public class DevicePolicyManager { 
     * <ul>

     * <ul>

     * <li>{@link #KEYGUARD_DISABLE_TRUST_AGENTS}, which affects the parent user, but only if there

     * <li>{@link #KEYGUARD_DISABLE_TRUST_AGENTS}, which affects the parent user, but only if there

     * is no separate challenge set on the managed profile.

     * is no separate challenge set on the managed profile.

     * <li>{@link #KEYGUARD_DISABLE_FINGERPRINT} which affects the managed profile challenge if

     * <li>{@link #KEYGUARD_DISABLE_FINGERPRINT}, {@link #KEYGUARD_DISABLE_FACE} or

     * {@link #KEYGUARD_DISABLE_IRIS} which affects the managed profile challenge if

     * there is one, or the parent user otherwise.

     * there is one, or the parent user otherwise.

     * <li>{@link #KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS} which affects notifications generated

     * <li>{@link #KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS} which affects notifications generated

     * by applications in the managed profile.

     * by applications in the managed profile.

     * </ul>

     * </ul>

     * {@link #KEYGUARD_DISABLE_TRUST_AGENTS} and {@link #KEYGUARD_DISABLE_FINGERPRINT} can also be

     * {@link #KEYGUARD_DISABLE_TRUST_AGENTS}, {@link #KEYGUARD_DISABLE_FINGERPRINT},

     * {@link #KEYGUARD_DISABLE_FACE} and {@link #KEYGUARD_DISABLE_IRIS} can also be

     * set on the {@link DevicePolicyManager} instance returned by

     * set on the {@link DevicePolicyManager} instance returned by

     * {@link #getParentProfileInstance(ComponentName)} in order to set restrictions on the parent

     * {@link #getParentProfileInstance(ComponentName)} in order to set restrictions on the parent

     * profile.

     * profile.
@@ -4740,12 +4742,16 @@ public class DevicePolicyManager { 
     * {@link #getKeyguardDisabledFeatures(ComponentName)}

     * {@link #getKeyguardDisabledFeatures(ComponentName)}

     *

     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @param which {@link #KEYGUARD_DISABLE_FEATURES_NONE} (default),

     * @param which The disabled features flag which can be either

     *            {@link #KEYGUARD_DISABLE_FEATURES_NONE} (default),

     *            {@link #KEYGUARD_DISABLE_FEATURES_ALL}, or a combination of

     *            {@link #KEYGUARD_DISABLE_WIDGETS_ALL}, {@link #KEYGUARD_DISABLE_SECURE_CAMERA},

     *            {@link #KEYGUARD_DISABLE_WIDGETS_ALL}, {@link #KEYGUARD_DISABLE_SECURE_CAMERA},

     *            {@link #KEYGUARD_DISABLE_SECURE_NOTIFICATIONS},

     *            {@link #KEYGUARD_DISABLE_SECURE_NOTIFICATIONS},

     *            {@link #KEYGUARD_DISABLE_TRUST_AGENTS},

     *            {@link #KEYGUARD_DISABLE_TRUST_AGENTS},

     *            {@link #KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS},

     *            {@link #KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS},

     *            {@link #KEYGUARD_DISABLE_FINGERPRINT}, {@link #KEYGUARD_DISABLE_FEATURES_ALL}

     *            {@link #KEYGUARD_DISABLE_FINGERPRINT},

     *            {@link #KEYGUARD_DISABLE_FACE},

     *            {@link #KEYGUARD_DISABLE_IRIS}.

     * @throws SecurityException if {@code admin} is not an active administrator or does not user

     * @throws SecurityException if {@code admin} is not an active administrator or does not user

     *             {@link DeviceAdminInfo#USES_POLICY_DISABLE_KEYGUARD_FEATURES}

     *             {@link DeviceAdminInfo#USES_POLICY_DISABLE_KEYGUARD_FEATURES}

     */

     */