Check for FingerprintManager before using.
Test: built
Bug: 32096112
Change-Id: I2d2ad86c7bf9a4aa16f26e90eb3fca86a6b4b2fb
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 9349c13..06858b7 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -752,7 +752,9 @@
}
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 @@
}
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: