Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added additional strings for fpm" into sc-dev

Browse Source
This commit is contained in:
Joshua Mccloskey
2021-04-13 18:21:01 +00:00
committed by Android (Google) Code Review
parent 72870e1173 952a19ab93
commit 1ce11286e0
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/android/hardware/fingerprint/FingerprintManager.java
View File

@@ -1268,12 +1268,17 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
return context.getString(
com.android.internal.R.string.fingerprint_error_security_update_required);
case FINGERPRINT_ERROR_VENDOR: {
String[] msgArray = context.getResources().getStringArray(
com.android.internal.R.array.fingerprint_error_vendor);
if (vendorCode < msgArray.length) {
String[] msgArray = context.getResources().getStringArray(
com.android.internal.R.array.fingerprint_error_vendor);
if (vendorCode < msgArray.length) {
if (Build.IS_ENG || Build.IS_USERDEBUG) {
return msgArray[vendorCode];
} else {
return context.getString(
com.android.internal.R.string.fingerprint_error_unable_to_process);
}
}
}
}
Slog.w(TAG, "Invalid error message: " + errMsg + ", " + vendorCode);
return null;
@@ -1302,12 +1307,17 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
return context.getString(
com.android.internal.R.string.fingerprint_acquired_too_fast);
case FINGERPRINT_ACQUIRED_VENDOR: {
String[] msgArray = context.getResources().getStringArray(
com.android.internal.R.array.fingerprint_acquired_vendor);
if (vendorCode < msgArray.length) {
String[] msgArray = context.getResources().getStringArray(
com.android.internal.R.array.fingerprint_acquired_vendor);
if (vendorCode < msgArray.length) {
if (Build.IS_ENG || Build.IS_USERDEBUG) {
return msgArray[vendorCode];
} else {
return context.getString(
com.android.internal.R.string.fingerprint_error_unable_to_process);
}
}
}
break;
case FINGERPRINT_ACQUIRED_START:
return null;