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

Commit ed32fa42 authored by James Willcox's avatar James Willcox Committed by Automerger Merge Worker
Browse files

Merge "Remove android.hardware.biometrics.last_authentication_time" into main am: 9debef0e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3455512



Change-Id: I2fdffead73a7e2f21ff0221018b3bb8356025624
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 681ea630 9debef0e

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -18977,13 +18977,13 @@ package android.hardware.biometrics { 
  public class BiometricManager {

    method @Deprecated @RequiresPermission(android.Manifest.permission.USE_BIOMETRIC) public int canAuthenticate();

    method @RequiresPermission(android.Manifest.permission.USE_BIOMETRIC) public int canAuthenticate(int);

    method @FlaggedApi("android.hardware.biometrics.last_authentication_time") @RequiresPermission(android.Manifest.permission.USE_BIOMETRIC) public long getLastAuthenticationTime(int);

    method @RequiresPermission(android.Manifest.permission.USE_BIOMETRIC) public long getLastAuthenticationTime(int);

    method @NonNull @RequiresPermission(android.Manifest.permission.USE_BIOMETRIC) public android.hardware.biometrics.BiometricManager.Strings getStrings(int);

    field public static final int BIOMETRIC_ERROR_HW_UNAVAILABLE = 1; // 0x1

    field public static final int BIOMETRIC_ERROR_NONE_ENROLLED = 11; // 0xb

    field public static final int BIOMETRIC_ERROR_NO_HARDWARE = 12; // 0xc

    field public static final int BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED = 15; // 0xf

    field @FlaggedApi("android.hardware.biometrics.last_authentication_time") public static final long BIOMETRIC_NO_AUTHENTICATION = -1L; // 0xffffffffffffffffL

    field public static final long BIOMETRIC_NO_AUTHENTICATION = -1L; // 0xffffffffffffffffL

    field public static final int BIOMETRIC_SUCCESS = 0; // 0x0

  }










@@ -19033,7 +19033,7 @@ package android.hardware.biometrics {













    field public static final int BIOMETRIC_ERROR_UNABLE_TO_PROCESS = 2; // 0x2















    field public static final int BIOMETRIC_ERROR_USER_CANCELED = 10; // 0xa















    field public static final int BIOMETRIC_ERROR_VENDOR = 8; // 0x8













    field @FlaggedApi("android.hardware.biometrics.last_authentication_time") public static final long BIOMETRIC_NO_AUTHENTICATION = -1L; // 0xffffffffffffffffL













    field public static final long BIOMETRIC_NO_AUTHENTICATION = -1L; // 0xffffffffffffffffL















  }





























  public abstract static class BiometricPrompt.AuthenticationCallback {

























core/java/android/hardware/biometrics/BiometricConstants.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -319,6 +319,5 @@ public interface BiometricConstants {













     * Returned from {@link BiometricManager#getLastAuthenticationTime(int)} when there has















     * been no successful authentication for the given authenticator since boot.















     */













    @FlaggedApi(Flags.FLAG_LAST_AUTHENTICATION_TIME)















    long BIOMETRIC_NO_AUTHENTICATION = -1;















}
























core/java/android/hardware/biometrics/BiometricManager.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -113,7 +113,6 @@ public class BiometricManager {













     * Returned from {@link BiometricManager#getLastAuthenticationTime(int)} when no matching















     * successful authentication has been performed since boot.















     */













    @FlaggedApi(Flags.FLAG_LAST_AUTHENTICATION_TIME)















    public static final long BIOMETRIC_NO_AUTHENTICATION =















            BiometricConstants.BIOMETRIC_NO_AUTHENTICATION;


























@@ -770,7 +769,6 @@ public class BiometricManager {













     */















    @RequiresPermission(USE_BIOMETRIC)















    @ElapsedRealtimeLong













    @FlaggedApi(Flags.FLAG_LAST_AUTHENTICATION_TIME)















    public long getLastAuthenticationTime(















            @BiometricManager.Authenticators.Types int authenticators) {















        if (authenticators == 0

































core/java/android/hardware/biometrics/flags.aconfig



+0
−8




























Original line number
Diff line number
Diff line















package: "android.hardware.biometrics"















container: "system"





























flag {













    name: "last_authentication_time"













    is_exported: true













    namespace: "wallet_integration"













    description: "Feature flag for adding getLastAuthenticationTime API to BiometricManager"













    bug: "301979982"













}





























flag {















  name: "add_key_agreement_crypto_object"















  is_exported: true

































services/core/java/com/android/server/biometrics/AuthService.java



+0
−7




























Original line number
Diff line number
Diff line








@@ -38,7 +38,6 @@ import android.hardware.biometrics.AuthenticationStateListener;













import android.hardware.biometrics.BiometricAuthenticator;















import android.hardware.biometrics.BiometricManager;















import android.hardware.biometrics.ComponentInfoInternal;













import android.hardware.biometrics.Flags;















import android.hardware.biometrics.IAuthService;















import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback;















import android.hardware.biometrics.IBiometricService;










@@ -399,12 +398,6 @@ public class AuthService extends SystemService {





























            final long identity = Binder.clearCallingIdentity();















            try {













                // We can't do this above because we need the READ_DEVICE_CONFIG permission, which













                // the calling user may not possess.













                if (!Flags.lastAuthenticationTime()) {













                    throw new UnsupportedOperationException();













                }





























                return mBiometricService.getLastAuthenticationTime(userId, authenticators);















            } finally {















                Binder.restoreCallingIdentity(identity);