PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash on devices without fingerprint feature."

Browse Source
This commit is contained in:
Jim Miller
2016-02-05 01:41:00 +00:00
committed by Android (Google) Code Review
parent bb300807b8 b528b26ea7
commit eb3b52d411
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/SecuritySettings.java
View File

@@ -690,7 +690,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
// Fingerprint // Fingerprint
FingerprintManager fpm = FingerprintManager fpm =
(FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE); (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 // This catches the title which can be overloaded in an overlay
data = new SearchIndexableRaw(context); data = new SearchIndexableRaw(context);
data.title = res.getString(R.string.security_settings_fingerprint_preference_title); data.title = res.getString(R.string.security_settings_fingerprint_preference_title);

2
src/com/android/settings/fingerprint/FingerprintSettings.java
View File

@@ -802,7 +802,7 @@ public class FingerprintSettings extends SubSettings {
public static Preference getFingerprintPreferenceForUser(Context context, int userId) { public static Preference getFingerprintPreferenceForUser(Context context, int userId) {
FingerprintManager fpm = (FingerprintManager) context.getSystemService( FingerprintManager fpm = (FingerprintManager) context.getSystemService(
Context.FINGERPRINT_SERVICE); Context.FINGERPRINT_SERVICE);
if (!fpm.isHardwareDetected()) { if (fpm == null || !fpm.isHardwareDetected()) {
Log.v(TAG, "No fingerprint hardware detected!!"); Log.v(TAG, "No fingerprint hardware detected!!");
return null; return null;
} }