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

Commit eb3b52d4 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix crash on devices without fingerprint feature."

parents bb300807 b528b26e

src/com/android/settings/SecuritySettings.java

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ public class SecuritySettings extends SettingsPreferenceFragment 
            // Fingerprint

            FingerprintManager fpm =

                    (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);

            if (fpm.isHardwareDetected()) {

            if (fpm != null && fpm.isHardwareDetected()) {

                // This catches the title which can be overloaded in an overlay

                data = new SearchIndexableRaw(context);

                data.title = res.getString(R.string.security_settings_fingerprint_preference_title);

src/com/android/settings/fingerprint/FingerprintSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -802,7 +802,7 @@ public class FingerprintSettings extends SubSettings { 
    public static Preference getFingerprintPreferenceForUser(Context context, int userId) {

        FingerprintManager fpm = (FingerprintManager) context.getSystemService(

                Context.FINGERPRINT_SERVICE);

        if (!fpm.isHardwareDetected()) {

        if (fpm == null || !fpm.isHardwareDetected()) {

            Log.v(TAG, "No fingerprint hardware detected!!");

            return null;

        }