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

Merge "Enable vendor error/acquire messages on user build" into sc-dev am: b7020910d3 am: 4ad6cb08ef

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15263625

Change-Id: I1721c92fd7cf0f277d2f5d5b2df020c2e5c55b55
This commit is contained in:
Joshua Mccloskey
2021-07-13 06:39:24 +00:00
committed by Automerger Merge Worker
parent 25e82a1d4d 4ad6cb08ef
commit 947c974bfc
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
return msgArray[vendorCode];
}
}
}
@@ -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);
}
return msgArray[vendorCode];
}
}
break;