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

Commit 57e5251a authored by Grace Cheng's avatar Grace Cheng
Browse files

Update result codes for Secure Lock Device 

Update order of result codes in AuthenticationPolicyManager to make
SUCCESS result code 0 for enableSecureLockDevice and
disableSecureLockDevice

Fixes: 399448749
Bug: 401645997
Flag: android.security.secure_lockdown
Test: atest AuthenticationPolicyServiceTest
Change-Id: Ic399f28649d89a888964344dc758986a0226adde
parent c94ed1d8

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -13016,9 +13016,9 @@ package android.security.authenticationpolicy { 
    field @FlaggedApi("android.security.secure_lockdown") public static final int ERROR_INVALID_PARAMS = 3; // 0x3

    field @FlaggedApi("android.security.secure_lockdown") public static final int ERROR_NOT_AUTHORIZED = 7; // 0x7

    field @FlaggedApi("android.security.secure_lockdown") public static final int ERROR_NO_BIOMETRICS_ENROLLED = 4; // 0x4

    field @FlaggedApi("android.security.secure_lockdown") public static final int ERROR_UNKNOWN = 0; // 0x0

    field @FlaggedApi("android.security.secure_lockdown") public static final int ERROR_UNKNOWN = 1; // 0x1

    field @FlaggedApi("android.security.secure_lockdown") public static final int ERROR_UNSUPPORTED = 2; // 0x2

    field @FlaggedApi("android.security.secure_lockdown") public static final int SUCCESS = 1; // 0x1

    field @FlaggedApi("android.security.secure_lockdown") public static final int SUCCESS = 0; // 0x0

  }















  @FlaggedApi("android.security.secure_lock_device") public static interface AuthenticationPolicyManager.SecureLockDeviceStatusListener {

























core/java/android/security/authenticationpolicy/AuthenticationPolicyManager.java



+8
−10




























Original line number
Diff line number
Diff line








@@ -101,28 +101,26 @@ public final class AuthenticationPolicyManager {













            mSecureLockDeviceStatusListeners = new ConcurrentHashMap<>();































    /**













     * Error result code for {@link #enableSecureLockDevice} and {@link #disableSecureLockDevice}.













     * Success result code for {@link #enableSecureLockDevice} and {@link #disableSecureLockDevice}.















     *













     * Secure lock device request status unknown.













     * Secure lock device request successful.















     *















     * @hide















     */















    @SystemApi















    @FlaggedApi(FLAG_SECURE_LOCKDOWN)













    public static final int ERROR_UNKNOWN = 0;













    public static final int SUCCESS = 0;































    /**













     * Success result code for {@link #enableSecureLockDevice} and {@link #disableSecureLockDevice}.













     * Error result code for {@link #enableSecureLockDevice} and {@link #disableSecureLockDevice}.















     *













     * Secure lock device request successful.













     * Secure lock device request status unknown.















     *















     * @hide















     */















    @SystemApi















    @FlaggedApi(FLAG_SECURE_LOCKDOWN)













    public static final int SUCCESS = 1;









































    public static final int ERROR_UNKNOWN = 1;































    /**















     * Error result code for {@link #enableSecureLockDevice} and {@link #disableSecureLockDevice}.










@@ -198,8 +196,8 @@ public final class AuthenticationPolicyManager {













     * @hide















     */















    @IntDef(prefix = {"ENABLE_SECURE_LOCK_DEVICE_STATUS_"}, value = {













            ERROR_UNKNOWN,















            SUCCESS,













            ERROR_UNKNOWN,















            ERROR_UNSUPPORTED,















            ERROR_INVALID_PARAMS,















            ERROR_NO_BIOMETRICS_ENROLLED,









@@ -215,8 +213,8 @@ public final class AuthenticationPolicyManager {













     * @hide















     */















    @IntDef(prefix = {"DISABLE_SECURE_LOCK_DEVICE_STATUS_"}, value = {













            ERROR_UNKNOWN,















            SUCCESS,













            ERROR_UNKNOWN,















            ERROR_UNSUPPORTED,















            ERROR_INVALID_PARAMS,















            ERROR_NOT_AUTHORIZED