summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/fingerprint
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-06-15 20:41:02 -0700
committerJim Miller <jaggies@google.com>2015-06-15 20:44:45 -0700
commit5adada6083c1fb5e520e3044698b03ee29772dab (patch)
tree3087518da8777e3baa2d25810afa72051766800c /src/com/android/settings/fingerprint
parentbada978ec3eab48564c29eb4f8169e88975a2da0 (diff)
downloadpackages_apps_Settings-5adada6083c1fb5e520e3044698b03ee29772dab.zip
packages_apps_Settings-5adada6083c1fb5e520e3044698b03ee29772dab.tar.gz
packages_apps_Settings-5adada6083c1fb5e520e3044698b03ee29772dab.tar.bz2
Limit number of fingerprint templates that can be enrolled per device user
This change places an upper limit on the number of fingerprint templates that can be enrolled per account. This is done primarily for performance reasons, but may also be imposed by hardware and Trusted Execution Environment (TEE) reasons. Fixes bug 20731847 Change-Id: I3975290fa8eb2106467493aab6102015697e012c On branch max_fingerprint
Diffstat (limited to 'src/com/android/settings/fingerprint')
-rw-r--r--src/com/android/settings/fingerprint/FingerprintEnrollFinish.java21
-rw-r--r--src/com/android/settings/fingerprint/FingerprintSettings.java14
2 files changed, 34 insertions, 1 deletions
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
index b87e029..d45f3c2 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
@@ -16,10 +16,18 @@
package com.android.settings.fingerprint;
+import android.content.Context;
+import android.hardware.fingerprint.Fingerprint;
+import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
+import android.preference.Preference;
import android.view.View;
+import android.widget.Button;
import com.android.settings.R;
+import com.android.settings.fingerprint.FingerprintSettings.FingerprintPreference;
+
+import java.util.List;
/**
* Activity which concludes fingerprint enrollment.
@@ -31,7 +39,18 @@ public class FingerprintEnrollFinish extends FingerprintEnrollBase {
super.onCreate(savedInstanceState);
setContentView(R.layout.fingerprint_enroll_finish);
setHeaderText(R.string.security_settings_fingerprint_enroll_finish_title);
- findViewById(R.id.add_another_button).setOnClickListener(this);
+ Button addButton = (Button) findViewById(R.id.add_another_button);
+
+ FingerprintManager fpm = (FingerprintManager) getSystemService(Context.FINGERPRINT_SERVICE);
+ int enrolled = fpm.getEnrolledFingerprints().size();
+ int max = getResources().getInteger(
+ com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);
+ if (enrolled >= max) {
+ /* Don't show "Add" button if too many fingerprints already added */
+ addButton.setVisibility(View.INVISIBLE);
+ } else {
+ addButton.setOnClickListener(this);
+ }
}
@Override
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index 5cbab66..fce46fa 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -179,6 +179,7 @@ public class FingerprintSettings extends SubSettings {
switch (msg.what) {
case MSG_REFRESH_FINGERPRINT_TEMPLATES:
removeFingerprintPreference(msg.arg1);
+ updateAddPreference();
break;
case MSG_FINGER_AUTH_SUCCESS:
mFingerprintCancel = null;
@@ -330,6 +331,19 @@ public class FingerprintSettings extends SubSettings {
addPreference.setIcon(R.drawable.ic_add_24dp);
root.addPreference(addPreference);
addPreference.setOnPreferenceChangeListener(this);
+ updateAddPreference();
+ }
+
+ private void updateAddPreference() {
+ /* Disable preference if too many fingerprints added */
+ final int max = getContext().getResources().getInteger(
+ com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);
+ boolean tooMany = mFingerprintManager.getEnrolledFingerprints().size() >= max;
+ CharSequence maxSummary = tooMany ?
+ getContext().getString(R.string.fingerprint_add_max, max) : "";
+ Preference addPreference = findPreference(KEY_FINGERPRINT_ADD);
+ addPreference.setSummary(maxSummary);
+ addPreference.setEnabled(!tooMany);
}
private static String genKey(int id) {