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

Commit 8d8bb6ee authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Check for FingerprintManager before using. 

Test: built
Bug: 32096112
Change-Id: I2d2ad86c7bf9a4aa16f26e90eb3fca86a6b4b2fb
parent 6906c957

src/com/android/settings/ChooseLockGeneric.java

+9 −2
Original line number Diff line number Diff line
@@ -752,7 +752,9 @@ public class ChooseLockGeneric extends SettingsActivity { 
        }



        private void removeManagedProfileFingerprintsAndFinishIfNecessary(final int parentUserId) {

            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: