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

Merge "Check for FingerprintManager before using."

Browse Source
This commit is contained in:
TreeHugger Robot
2016-10-13 20:44:24 +00:00
committed by Android (Google) Code Review
parent fdca235dc5 8d8bb6ee1d
commit 3bada0d272
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -752,7 +752,9 @@ public class ChooseLockGeneric extends SettingsActivity {
} }
private void removeManagedProfileFingerprintsAndFinishIfNecessary(final int parentUserId) { 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()); final UserManager um = UserManager.get(getActivity());
boolean hasChildProfile = false; boolean hasChildProfile = false;
if (!um.getUserInfo(parentUserId).isManagedProfile()) { if (!um.getUserInfo(parentUserId).isManagedProfile()) {
@@ -791,7 +793,12 @@ public class ChooseLockGeneric extends SettingsActivity {
} }
private int getResIdForFactoryResetProtectionWarningMessage() { 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); boolean isProfile = UserManager.get(getActivity()).isManagedProfile(mUserId);
switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(mUserId)) { switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(mUserId)) {
case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: