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

Commit eb0365f1 authored by Joe Bolinger's avatar Joe Bolinger Committed by Android (Google) Code Review
Browse files

Revert "Remove FingerprintManager API." 

Revert submission 26197163-remove-fpm

Reason for revert: Temporarily reverting until U branches are disconnected from main (b/326188442) around March 5th.

Reverted changes: /q/submissionid:26197163-remove-fpm

Change-Id: I4fdb64c90f25e84dac1b7aca306caa0c4c1ec139
parent d8d2a04d

core/api/current.txt

+49 −0
Original line number Diff line number Diff line
@@ -10732,6 +10732,7 @@ package android.content { 
    field public static final String DROPBOX_SERVICE = "dropbox";

    field public static final String EUICC_SERVICE = "euicc";

    field public static final String FILE_INTEGRITY_SERVICE = "file_integrity";

    field public static final String FINGERPRINT_SERVICE = "fingerprint";

    field public static final String GAME_SERVICE = "game";

    field public static final String GRAMMATICAL_INFLECTION_SERVICE = "grammatical_inflection";

    field public static final String HARDWARE_PROPERTIES_SERVICE = "hardware_properties";
@@ -20361,6 +20362,54 @@ package android.hardware.display { 














}



























package android.hardware.fingerprint {

























  @Deprecated public class FingerprintManager {













    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.USE_BIOMETRIC, android.Manifest.permission.USE_FINGERPRINT}) public void authenticate(@Nullable android.hardware.fingerprint.FingerprintManager.CryptoObject, @Nullable android.os.CancellationSignal, int, @NonNull android.hardware.fingerprint.FingerprintManager.AuthenticationCallback, @Nullable android.os.Handler);













    method @Deprecated @RequiresPermission(android.Manifest.permission.USE_FINGERPRINT) public boolean hasEnrolledFingerprints();













    method @Deprecated @RequiresPermission(android.Manifest.permission.USE_FINGERPRINT) public boolean isHardwareDetected();













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













    field public static final int FINGERPRINT_ACQUIRED_IMAGER_DIRTY = 3; // 0x3













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













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













    field public static final int FINGERPRINT_ACQUIRED_TOO_FAST = 5; // 0x5













    field public static final int FINGERPRINT_ACQUIRED_TOO_SLOW = 4; // 0x4













    field public static final int FINGERPRINT_ERROR_CANCELED = 5; // 0x5













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













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













    field public static final int FINGERPRINT_ERROR_LOCKOUT = 7; // 0x7













    field public static final int FINGERPRINT_ERROR_LOCKOUT_PERMANENT = 9; // 0x9













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













    field public static final int FINGERPRINT_ERROR_NO_SPACE = 4; // 0x4













    field public static final int FINGERPRINT_ERROR_TIMEOUT = 3; // 0x3













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













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













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













  }

























  @Deprecated public abstract static class FingerprintManager.AuthenticationCallback {













    ctor @Deprecated public FingerprintManager.AuthenticationCallback();













    method @Deprecated public void onAuthenticationError(int, CharSequence);













    method @Deprecated public void onAuthenticationFailed();













    method @Deprecated public void onAuthenticationHelp(int, CharSequence);













    method @Deprecated public void onAuthenticationSucceeded(android.hardware.fingerprint.FingerprintManager.AuthenticationResult);













  }

























  @Deprecated public static class FingerprintManager.AuthenticationResult {













    method @Deprecated public android.hardware.fingerprint.FingerprintManager.CryptoObject getCryptoObject();













  }

























  @Deprecated public static final class FingerprintManager.CryptoObject {













    ctor @Deprecated public FingerprintManager.CryptoObject(@NonNull java.security.Signature);













    ctor @Deprecated public FingerprintManager.CryptoObject(@NonNull javax.crypto.Cipher);













    ctor @Deprecated public FingerprintManager.CryptoObject(@NonNull javax.crypto.Mac);













    method @Deprecated public javax.crypto.Cipher getCipher();













    method @Deprecated public javax.crypto.Mac getMac();













    method @Deprecated public java.security.Signature getSignature();













  }

























}



























package android.hardware.input {





























  public final class HostUsiVersion implements android.os.Parcelable {

























core/api/removed.txt



+0
−49




























Original line number
Diff line number
Diff line








@@ -35,7 +35,6 @@ package android.content {













    method @Deprecated @Nullable public String getFeatureId();















    method public abstract android.content.SharedPreferences getSharedPreferences(java.io.File, int);















    method public abstract java.io.File getSharedPreferencesPath(String);













    field public static final String FINGERPRINT_SERVICE = "fingerprint";















  }































  public class ContextWrapper extends android.content.Context {










@@ -146,54 +145,6 @@ package android.hardware {





























}





























package android.hardware.fingerprint {



























  @Deprecated public class FingerprintManager {













    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.USE_BIOMETRIC, android.Manifest.permission.USE_FINGERPRINT}) public void authenticate(@Nullable android.hardware.fingerprint.FingerprintManager.CryptoObject, @Nullable android.os.CancellationSignal, int, @NonNull android.hardware.fingerprint.FingerprintManager.AuthenticationCallback, @Nullable android.os.Handler);













    method @Deprecated @RequiresPermission(android.Manifest.permission.USE_FINGERPRINT) public boolean hasEnrolledFingerprints();













    method @Deprecated @RequiresPermission(android.Manifest.permission.USE_FINGERPRINT) public boolean isHardwareDetected();













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













    field public static final int FINGERPRINT_ACQUIRED_IMAGER_DIRTY = 3; // 0x3













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













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













    field public static final int FINGERPRINT_ACQUIRED_TOO_FAST = 5; // 0x5













    field public static final int FINGERPRINT_ACQUIRED_TOO_SLOW = 4; // 0x4













    field public static final int FINGERPRINT_ERROR_CANCELED = 5; // 0x5













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













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













    field public static final int FINGERPRINT_ERROR_LOCKOUT = 7; // 0x7













    field public static final int FINGERPRINT_ERROR_LOCKOUT_PERMANENT = 9; // 0x9













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













    field public static final int FINGERPRINT_ERROR_NO_SPACE = 4; // 0x4













    field public static final int FINGERPRINT_ERROR_TIMEOUT = 3; // 0x3













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













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













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













  }



























  @Deprecated public abstract static class FingerprintManager.AuthenticationCallback {













    ctor public FingerprintManager.AuthenticationCallback();













    method public void onAuthenticationError(int, CharSequence);













    method public void onAuthenticationFailed();













    method public void onAuthenticationHelp(int, CharSequence);













    method public void onAuthenticationSucceeded(android.hardware.fingerprint.FingerprintManager.AuthenticationResult);













  }



























  @Deprecated public static class FingerprintManager.AuthenticationResult {













    method public android.hardware.fingerprint.FingerprintManager.CryptoObject getCryptoObject();













  }



























  @Deprecated public static final class FingerprintManager.CryptoObject {













    ctor public FingerprintManager.CryptoObject(@NonNull java.security.Signature);













    ctor public FingerprintManager.CryptoObject(@NonNull javax.crypto.Cipher);













    ctor public FingerprintManager.CryptoObject(@NonNull javax.crypto.Mac);













    method public javax.crypto.Cipher getCipher();













    method public javax.crypto.Mac getMac();













    method public java.security.Signature getSignature();













  }



























}





























package android.media {































  public final class AudioFormat implements android.os.Parcelable {

































core/api/test-current.txt



+9
−0




























Original line number
Diff line number
Diff line








@@ -1706,6 +1706,15 @@ package android.hardware.display {





























}





























package android.hardware.fingerprint {



























  @Deprecated public class FingerprintManager {













    method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.TEST_BIOMETRIC) public android.hardware.biometrics.BiometricTestSession createTestSession(int);













    method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.TEST_BIOMETRIC) public java.util.List<android.hardware.biometrics.SensorProperties> getSensorProperties();













  }



























}





























package android.hardware.hdmi {































  public final class HdmiControlServiceWrapper {

































core/api/test-removed.txt



+0
−9




























Original line number
Diff line number
Diff line















// Signature format: 2.0












package android.hardware.fingerprint {



























  @Deprecated public class FingerprintManager {













    method @NonNull @RequiresPermission(android.Manifest.permission.TEST_BIOMETRIC) public android.hardware.biometrics.BiometricTestSession createTestSession(int);













    method @NonNull @RequiresPermission(android.Manifest.permission.TEST_BIOMETRIC) public java.util.List<android.hardware.biometrics.SensorProperties> getSensorProperties();













  }



























}





































core/java/android/content/Context.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -5066,7 +5066,6 @@ public abstract class Context {













     * {@link android.hardware.fingerprint.FingerprintManager} for handling management















     * of fingerprints.















     *













     * @removed See {@link android.hardware.biometrics.BiometricPrompt}















     * @see #getSystemService(String)















     * @see android.hardware.fingerprint.FingerprintManager















     */