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

Merge "Fixes for Work Challenge Fingerprint" into nyc-dev am: 2753f88723

Browse Source 
am: b888d3c9ae

* commit 'b888d3c9ae2cad1ed17b412eaf6f1ec9f7efc5fd':
  Fixes for Work Challenge Fingerprint
This commit is contained in:
Clara Bayarri
2016-03-02 04:51:30 +00:00
committed by android-build-merger
parent 8de9c36b84 b888d3c9ae
commit c17fdaca54
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -611,12 +611,26 @@ public class ChooseLockGeneric extends SettingsActivity {
private void removeAllFingerprintTemplatesAndFinish() {
if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()
&& mFingerprintManager.getEnrolledFingerprints().size() > 0) {
&& mFingerprintManager.hasEnrolledFingerprints(mUserId)) {
mFingerprintManager.setActiveUser(mUserId);
mFingerprintManager.remove(
new Fingerprint(null, 0, 0, 0), mUserId, mRemovalCallback);
} else {
finish();
new Fingerprint(null, mUserId, 0, 0), mUserId,
new RemovalCallback() {
@Override
public void onRemovalError(Fingerprint fp, int errMsgId,
CharSequence errString) {
mRemovalCallback.onRemovalError(fp, errMsgId, errString);
mFingerprintManager.setActiveUser(UserHandle.myUserId());
}
@Override
public void onRemovalSucceeded(Fingerprint fingerprint) {
mRemovalCallback.onRemovalSucceeded(fingerprint);
mFingerprintManager.setActiveUser(UserHandle.myUserId());
}
});
}
finish();
}
@Override
@@ -636,7 +650,7 @@ public class ChooseLockGeneric extends SettingsActivity {
}
private int getResIdForFactoryResetProtectionWarningMessage() {
boolean hasFingerprints = mFingerprintManager.hasEnrolledFingerprints();
boolean hasFingerprints = mFingerprintManager.hasEnrolledFingerprints(mUserId);
boolean isProfile = Utils.isManagedProfile(UserManager.get(getActivity()), mUserId);
switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(mUserId)) {
case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: