Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4743da4 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

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

Merge "Enable vendor error/acquire messages on user build" into sc-dev am: b7020910 am: 76dfedc1

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

Change-Id: I5c2e67e6cb808d42e72d7ea4931c39e106f6d5ab
parents 1579dcd8 76dfedc1

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;