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

This commit is contained in:
TreeHugger Robot
2017-04-21 01:56:57 +00:00
committed by Android (Google) Code Review
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 =