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

Browse Source 
am: 2753f88723

* commit '2753f88723bc9213c4df9763dddc27609c54e181':
  Fixes for Work Challenge Fingerprint
This commit is contained in:
Clara Bayarri
2016-03-01 23:29:41 +00:00
committed by android-build-merger
parent b78f20354e 2753f88723
commit b888d3c9ae
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() { private void removeAllFingerprintTemplatesAndFinish() {
if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected() if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()
&& mFingerprintManager.getEnrolledFingerprints().size() > 0) { && mFingerprintManager.hasEnrolledFingerprints(mUserId)) {
mFingerprintManager.setActiveUser(mUserId);
mFingerprintManager.remove( mFingerprintManager.remove(
new Fingerprint(null, 0, 0, 0), mUserId, mRemovalCallback); new Fingerprint(null, mUserId, 0, 0), mUserId,
} else { new RemovalCallback() {
finish(); @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 @Override
@@ -636,7 +650,7 @@ public class ChooseLockGeneric extends SettingsActivity {
} }
private int getResIdForFactoryResetProtectionWarningMessage() { private int getResIdForFactoryResetProtectionWarningMessage() {
boolean hasFingerprints = mFingerprintManager.hasEnrolledFingerprints(); boolean hasFingerprints = mFingerprintManager.hasEnrolledFingerprints(mUserId);
boolean isProfile = Utils.isManagedProfile(UserManager.get(getActivity()), mUserId); boolean isProfile = Utils.isManagedProfile(UserManager.get(getActivity()), mUserId);
switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(mUserId)) { switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(mUserId)) {
case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: