diff options
| -rw-r--r-- | core/java/android/hardware/fingerprint/FingerprintCallback.java | 2 | ||||
| -rw-r--r-- | core/java/android/hardware/fingerprint/FingerprintManager.java | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/core/java/android/hardware/fingerprint/FingerprintCallback.java b/core/java/android/hardware/fingerprint/FingerprintCallback.java index 24e9f9ddef77..e4fbe6e09709 100644 --- a/core/java/android/hardware/fingerprint/FingerprintCallback.java +++ b/core/java/android/hardware/fingerprint/FingerprintCallback.java @@ -189,7 +189,7 @@ public class FingerprintCallback { mEnrollmentCallback.onAcquired(acquireInfo == FINGERPRINT_ACQUIRED_GOOD); } final String msg = getAcquiredString(context, acquireInfo, vendorCode); - if (msg == null || msg.isEmpty()) { + if (msg == null) { return; } // emulate HAL 2.1 behavior and send real acquiredInfo diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java index 7f1cac08b430..590c4d661076 100644 --- a/core/java/android/hardware/fingerprint/FingerprintManager.java +++ b/core/java/android/hardware/fingerprint/FingerprintManager.java @@ -1517,7 +1517,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing */ public static String getAcquiredString(Context context, int acquireInfo, int vendorCode) { switch (acquireInfo) { - case FINGERPRINT_ACQUIRED_GOOD: + case FINGERPRINT_ACQUIRED_GOOD, FINGERPRINT_ACQUIRED_START: return null; case FINGERPRINT_ACQUIRED_PARTIAL: return context.getString( @@ -1546,13 +1546,10 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing case FINGERPRINT_ACQUIRED_VENDOR: { String[] msgArray = context.getResources().getStringArray( com.android.internal.R.array.fingerprint_acquired_vendor); - if (vendorCode < msgArray.length) { + if (vendorCode < msgArray.length && !msgArray[vendorCode].isEmpty()) { return msgArray[vendorCode]; } } - break; - case FINGERPRINT_ACQUIRED_START: - return null; } Slog.w(TAG, "Invalid acquired message: " + acquireInfo + ", " + vendorCode); return null; |