diff options
| author | Jim Miller <jaggies@google.com> | 2014-05-20 23:18:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-20 23:18:48 +0000 |
| commit | 430259a1d83446d9aac1c27f88bff923c14d9a8c (patch) | |
| tree | fb61f07752b526e9dd4458acabcab5d1aed55b91 | |
| parent | 00592c2700f5b23c6d1ec6f132b013cd9e91390a (diff) | |
| parent | d08c2aceb238b02d8348518a2c87693054c6ce37 (diff) | |
| download | frameworks_base-430259a1d83446d9aac1c27f88bff923c14d9a8c.zip frameworks_base-430259a1d83446d9aac1c27f88bff923c14d9a8c.tar.gz frameworks_base-430259a1d83446d9aac1c27f88bff923c14d9a8c.tar.bz2 | |
Merge "Update FingerprintManager API after discussions."
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/service/fingerprint/FingerprintManager.java | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index f6bc276..fe2e228 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25607,10 +25607,10 @@ package android.service.fingerprint { public class FingerprintManager { ctor public FingerprintManager(android.content.Context); method public void enroll(long); + method public boolean enrolledAndEnabled(); method public void remove(int); method public void startListening(android.service.fingerprint.FingerprintManagerReceiver); method public void stopListening(); - field protected static final boolean DEBUG = true; field public static final int FINGERPRINT_ERROR = -1; // 0xffffffff field public static final int FINGERPRINT_ERROR_BAD_CAPTURE = 2; // 0x2 field public static final int FINGERPRINT_ERROR_HW_UNAVAILABLE = 1; // 0x1 diff --git a/core/java/android/service/fingerprint/FingerprintManager.java b/core/java/android/service/fingerprint/FingerprintManager.java index 0d14c59..2fcec52 100644 --- a/core/java/android/service/fingerprint/FingerprintManager.java +++ b/core/java/android/service/fingerprint/FingerprintManager.java @@ -18,6 +18,7 @@ package android.service.fingerprint; import android.app.ActivityManagerNative; import android.content.ComponentName; +import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; @@ -25,6 +26,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.RemoteException; import android.os.UserHandle; +import android.provider.Settings; import android.util.Log; /** @@ -33,7 +35,7 @@ import android.util.Log; public class FingerprintManager { private static final String TAG = "FingerprintManager"; - protected static final boolean DEBUG = true; + private static final boolean DEBUG = true; private static final String FINGERPRINT_SERVICE_PACKAGE = "com.android.service.fingerprint"; private static final String FINGERPRINT_SERVICE_CLASS = "com.android.service.fingerprint.FingerprintService"; @@ -58,6 +60,7 @@ public class FingerprintManager { private IFingerprintService mService; private FingerprintManagerReceiver mClientReceiver; + private Context mContext; private Handler mHandler = new Handler() { public void handleMessage(android.os.Message msg) { @@ -80,6 +83,7 @@ public class FingerprintManager { }; public FingerprintManager(Context context) { + mContext = context; // Connect to service... Intent intent = new Intent(); intent.setClassName(FINGERPRINT_SERVICE_PACKAGE, FINGERPRINT_SERVICE_CLASS); @@ -129,6 +133,17 @@ public class FingerprintManager { }; /** + * Determine whether the user has at least one fingerprint enrolled and enabled. + * + * @return true if at least one is enrolled and enabled + */ + public boolean enrolledAndEnabled() { + ContentResolver res = mContext.getContentResolver(); + return Settings.Secure.getInt(res, "fingerprint_enabled", 0) != 0 + && FingerprintUtils.getFingerprintIdsForUser(res, getCurrentUserId()).length > 0; + } + + /** * Start the enrollment process. Timeout dictates how long to wait for the user to * enroll a fingerprint. * |