Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev

am: 9e89d528f6

Change-Id: I1ee72cec3e831652d1bae451b8c43d9d8032c74d
This commit is contained in:
Ajay Nadathur
2017-04-21 02:23:13 +00:00
committed by android-build-merger
2 changed files with 126 additions and 1 deletions

View File

@@ -68,7 +68,11 @@ public class SuggestionsChecks {
} else if (className.equals(ScreenLockSuggestionActivity.class.getName())) {
return isDeviceSecured();
} else if (className.equals(FingerprintEnrollSuggestionActivity.class.getName())) {
return isDeviceSecured() || !isFingerprintEnabled();
FingerprintManager manager = Utils.getFingerprintManagerOrNull(mContext);
if (manager == null || !isFingerprintEnabled()) {
return true;
}
return manager.hasEnrolledFingerprints();
}
SuggestionFeatureProvider provider =