diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 9ec4f0f2af3..97f59c12a88 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1647,6 +1647,8 @@ - + + Fingerprint is immobile + diff --git a/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java b/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java index a70144d47e7..d382912efe3 100644 --- a/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java +++ b/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java @@ -200,7 +200,14 @@ public class SfpsEnrollmentFeatureImpl implements SfpsEnrollmentFeature { private static String getVendorString(Context ctx, int index) { String[] strings = ctx.getResources().getStringArray(R.array.fingerprint_acquired_vendor); - Preconditions.checkArgumentInRange(index, 0, strings.length - 1, "vendor string index"); + if (strings == null || strings.length == 0) { + Log.e(TAG, "Vendor string array is null or empty"); + return ""; + } + if (index < 0 || index >= strings.length) { + Log.e(TAG, "vendor string index is out of range: " + index + " (size: " + strings.length + ")"); + return ""; + } return strings[index]; }