From b528b26ea730fa468a92970f515c312a91bfcf37 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Thu, 4 Feb 2016 17:10:44 -0800 Subject: [PATCH] Fix crash on devices without fingerprint feature. Fixes bug 26877020 Change-Id: Ibee4d956beb0ce9af35f01857370c1378ef5594a --- src/com/android/settings/SecuritySettings.java | 2 +- src/com/android/settings/fingerprint/FingerprintSettings.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 3e873d463c7..b0fdcad89af 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -691,7 +691,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); diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java index 8b5da8780a4..b2b4c54d688 100644 --- a/src/com/android/settings/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/fingerprint/FingerprintSettings.java @@ -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; }