diff options
author | Joe Bolinger <jbolinger@google.com> | 2021-08-13 15:36:56 -0700 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-17 22:53:55 +0000 |
commit | 436f041ed91aaa604c3f8e30c8ff59dc7088dbc8 (patch) | |
tree | 20fddf58928191bb87ab4f55a909ca9f3b0cf059 | |
parent | fee0bc79657d3bae1446c974a5ec757c54a98443 (diff) | |
download | base-436f041ed91aaa604c3f8e30c8ff59dc7088dbc8.tar.gz |
Add a generic error message for missing vendor error strings.
The message is empty, instead of null, to prevent apps from crashing but it will be changed to a more meaninful string in a future change.
Fix: 196176475
Test: N/A
Change-Id: I7823084238a87cb1b8892b8550c472cd8b40f556
(cherry picked from commit 5d5d9eb8122b33705a864a1946da479af2bd10db)
-rw-r--r-- | core/java/android/hardware/face/FaceManager.java | 5 | ||||
-rw-r--r-- | core/java/android/hardware/fingerprint/FingerprintManager.java | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/core/java/android/hardware/face/FaceManager.java b/core/java/android/hardware/face/FaceManager.java index 3c3ba595f3fb..385ad2d3577f 100644 --- a/core/java/android/hardware/face/FaceManager.java +++ b/core/java/android/hardware/face/FaceManager.java @@ -790,6 +790,11 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan } } } + + // This is used as a last resort in case a vendor string is missing + // It should not happen for anything other than FACE_ERROR_VENDOR, but + // warn and use the default if all else fails. + // TODO(b/196639965): update string Slog.w(TAG, "Invalid error message: " + errMsg + ", " + vendorCode); return ""; } diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java index dc1a50fa6616..87d45b9de745 100644 --- a/core/java/android/hardware/fingerprint/FingerprintManager.java +++ b/core/java/android/hardware/fingerprint/FingerprintManager.java @@ -1386,8 +1386,13 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing } } } + + // This is used as a last resort in case a vendor string is missing + // It should not happen for anything other than FINGERPRINT_ERROR_VENDOR, but + // warn and use the default if all else fails. + // TODO(b/196639965): update string Slog.w(TAG, "Invalid error message: " + errMsg + ", " + vendorCode); - return null; + return ""; } /** |