commit 324e1539bce2a23c83c02b25fd82f8a04f02aff8
author Jorim Jaggi <jjaggi@google.com> Wed Nov 23 15:29:46 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 23 15:29:51 2016 +0000
tree 8d6d427d6f7e18fb2be73702a31446de881b610b
parent 81981fe852a85999b2403505edc343feaeefe7dd
parent 3f12426d006bc1bd51b59601de1ccc558227687b

Merge "Only acquire FPM if feature is available"

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 6a2949a..cdcc05c 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -1112,7 +1112,9 @@
         mTrustManager.registerTrustListener(this);
         new LockPatternUtils(context).registerStrongAuthTracker(mStrongAuthTracker);
 
-        mFpm = (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
+        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
+            mFpm = (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
+        }
         updateFingerprintListeningState();
         if (mFpm != null) {
             mFpm.addLockoutResetCallback(mLockoutResetCallback);