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

Check for FingerprintManager before using.

Browse Source 
Test: built
Bug: 32096112
Change-Id: I2d2ad86c7bf9a4aa16f26e90eb3fca86a6b4b2fb
This commit is contained in:
Jeff Sharkey
2016-10-13 12:59:17 -06:00
parent 6906c95773
commit 8d8bb6ee1d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -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: