summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Mast <andy@cyngn.com>2015-07-07 15:39:02 -0700
committerAndy Mast <andy@cyngn.com>2015-07-12 19:02:00 -0700
commitef5c2717c9c9fda85458e8be7e74e4b223d34e10 (patch)
tree716d2810718fd4fa8c170392065644042e586a53
parent30395c2c09d832673e70acfbd6f8b3b3b1359adb (diff)
downloadandroid_frameworks_base-ef5c2717c9c9fda85458e8be7e74e4b223d34e10.tar.gz
android_frameworks_base-ef5c2717c9c9fda85458e8be7e74e4b223d34e10.tar.bz2
android_frameworks_base-ef5c2717c9c9fda85458e8be7e74e4b223d34e10.zip
Keyguard Fingerprint: Don't cancel if device doesn't have the feature
Change-Id: Ice042008d9a99270c4e51c384dfee24c97d0b1da
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
index e052815fa03..26f3137b170 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -1561,10 +1561,12 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
}
public void stopAuthenticatingFingerprint() {
- FingerprintManager fpm =
- (FingerprintManager) mContext.getSystemService(Context.FINGERPRINT_SERVICE);
- fpm.cancel();
- fpm.stopListening();
+ if (mLockPatternUtils.isFingerprintInstalled(mContext)) {
+ FingerprintManager fpm =
+ (FingerprintManager) mContext.getSystemService(Context.FINGERPRINT_SERVICE);
+ fpm.cancel();
+ fpm.stopListening();
+ }
}
public void clearFingerprintRecognized() {