From 8d8bb6ee1dd070f612133da4573df02d9ef267aa Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Thu, 13 Oct 2016 12:59:17 -0600 Subject: [PATCH] Check for FingerprintManager before using. Test: built Bug: 32096112 Change-Id: I2d2ad86c7bf9a4aa16f26e90eb3fca86a6b4b2fb --- src/com/android/settings/ChooseLockGeneric.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 9349c13d297..06858b749a9 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -752,7 +752,9 @@ public class ChooseLockGeneric extends SettingsActivity { } private void removeManagedProfileFingerprintsAndFinishIfNecessary(final int parentUserId) { - mFingerprintManager.setActiveUser(UserHandle.myUserId()); + if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()) { + mFingerprintManager.setActiveUser(UserHandle.myUserId()); + } final UserManager um = UserManager.get(getActivity()); boolean hasChildProfile = false; if (!um.getUserInfo(parentUserId).isManagedProfile()) { @@ -791,7 +793,12 @@ public class ChooseLockGeneric extends SettingsActivity { } private int getResIdForFactoryResetProtectionWarningMessage() { - boolean hasFingerprints = mFingerprintManager.hasEnrolledFingerprints(mUserId); + final boolean hasFingerprints; + if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()) { + hasFingerprints = mFingerprintManager.hasEnrolledFingerprints(mUserId); + } else { + hasFingerprints = false; + } boolean isProfile = UserManager.get(getActivity()).isManagedProfile(mUserId); switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(mUserId)) { case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: