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

Commit dede5849 authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

Merge "Add a generic error message for missing vendor error strings." into sc-dev am: 922fe0da 

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

Change-Id: Iaf69acf3d3324f69f31f809e73dcda43111aacd6
parents 2cd85fb0 922fe0da

core/java/android/hardware/face/FaceManager.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -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);

        Slog.w(TAG, "Invalid error message: " + errMsg + ", " + vendorCode);

        return "";

        return "";

    }

    }

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

+6 −1
Original line number Original line Diff line number Diff line
@@ -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);

        Slog.w(TAG, "Invalid error message: " + errMsg + ", " + vendorCode);

        return null;

        return "";

    }

    }





    /**

    /**