Merge "Add check for empty vendor acquired strings" into main (119da8d4) · Commits · e / os / android_frameworks_base

core/java/android/hardware/fingerprint/FingerprintCallback.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+2 −5

Original line number	Diff line number	Diff line
		@@ -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;