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

Browse Source
This commit is contained in:
Joshua Mccloskey
2021-07-13 06:15:50 +00:00
committed by Android (Google) Code Review
parent b7ac726393 27f49c34b9
commit b7020910d3
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( String[] msgArray = context.getResources().getStringArray(
com.android.internal.R.array.fingerprint_error_vendor); com.android.internal.R.array.fingerprint_error_vendor);
if (vendorCode < msgArray.length) { if (vendorCode < msgArray.length) {
if (Build.IS_ENG || Build.IS_USERDEBUG) { return msgArray[vendorCode];
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( String[] msgArray = context.getResources().getStringArray(
com.android.internal.R.array.fingerprint_acquired_vendor); com.android.internal.R.array.fingerprint_acquired_vendor);
if (vendorCode < msgArray.length) { if (vendorCode < msgArray.length) {
if (Build.IS_ENG || Build.IS_USERDEBUG) { return msgArray[vendorCode];
return msgArray[vendorCode];
} else {
return context.getString(
com.android.internal.R.string.fingerprint_error_unable_to_process);
}
} }
} }
break; break;