Merge "Enable vendor error/acquire messages on user build" into sc-dev (b7020910) · Commits · e / os / android_frameworks_base

core/java/android/hardware/fingerprint/FingerprintManager.java

+2 −12

Original line number	Diff line number	Diff line
		@@ -1382,12 +1382,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		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);
		}
		}
		}
		}
		@@ -1427,12 +1422,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		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;