summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-04-21 01:56:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-04-21 01:56:58 +0000
commit9e89d528f6e7dc8b689e98ef838ca876c2817959 (patch)
tree2545872e4576e7386ec4877b4af3b8264c05fb84 /src
parent72ca5b0bb2e1786b3dd6306c7bdc507f32f8a4cd (diff)
parent22ebdd949310d6aabec680a96de876fd0652a29b (diff)
downloadpackages_apps_Settings-9e89d528f6e7dc8b689e98ef838ca876c2817959.tar.gz
packages_apps_Settings-9e89d528f6e7dc8b689e98ef838ca876c2817959.tar.bz2
packages_apps_Settings-9e89d528f6e7dc8b689e98ef838ca876c2817959.zip
Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java b/src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java
index 9a92c93afd..1be2c682af 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java
@@ -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 =