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

Commit 8780817b authored by Grace Cheng's avatar Grace Cheng
Browse files

Revert "Update result codes for Secure Lock Device" 

This reverts commit cb207ba0.

Reason for revert: b/415155902

Flag: android.security.secure_lockdown
Bug: 401645997
Fixes: 415155902
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bb524ecfb1e2a0ee4ee57b27b52dc4d33d1d4610)
Change-Id: Idc43921bf3973f7f840eddbdf348624d0b8b939c
parent 2e3d63ae

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -12919,9 +12919,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 = 1; // 0x1

    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_UNSUPPORTED = 2; // 0x2

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

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

  }















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

























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



+10
−9




























Original line number
Diff line number
Diff line








@@ -99,28 +99,29 @@ public final class AuthenticationPolicyManager {













            <SecureLockDeviceStatusListener, ISecureLockDeviceStatusListener.Stub>















            mSecureLockDeviceStatusListeners = new ConcurrentHashMap<>();













































    /**













     * 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 = 0;













    public static final int ERROR_UNKNOWN = 0;































    /**













     * 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 = 1;













    public static final int SUCCESS = 1;



























































    /**















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










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













     * @hide















     */















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













            SUCCESS,















            ERROR_UNKNOWN,













            SUCCESS,















            ERROR_UNSUPPORTED,















            ERROR_INVALID_PARAMS,















            ERROR_NO_BIOMETRICS_ENROLLED,









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













     * @hide















     */















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













            SUCCESS,















            ERROR_UNKNOWN,













            SUCCESS,















            ERROR_UNSUPPORTED,















            ERROR_INVALID_PARAMS,















            ERROR_NOT_AUTHORIZED