Merge "Update result codes for Secure Lock Device" into main (86cbb30c) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -12698,9 +12698,9 @@ package android.security.authenticationpolicy {
		field @FlaggedApi("android.security.secure_lockdown") public static final int ERROR_INSUFFICIENT_BIOMETRICS = 5; // 0x5
		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_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_lockdown") public final class DisableSecureLockDeviceParams implements android.os.Parcelable {

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -60,27 +60,27 @@ public final class AuthenticationPolicyManager {
		@NonNull private final Context mContext;

		/**
		* 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}.
		@@ -147,8 +147,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,
		@@ -164,8 +164,8 @@ public final class AuthenticationPolicyManager {
		* @hide
		*/
		@IntDef(prefix = {"DISABLE_SECURE_LOCK_DEVICE_STATUS_"}, value = {
		ERROR_UNKNOWN,
		SUCCESS,
		ERROR_UNKNOWN,
		ERROR_UNSUPPORTED,
		ERROR_INVALID_PARAMS,
		})