commit 3f12426d006bc1bd51b59601de1ccc558227687b
author Jorim Jaggi <jjaggi@google.com> Tue Nov 22 13:45:17 2016 +0100
committer Jorim Jaggi <jjaggi@google.com> Wed Nov 23 10:25:48 2016 +0000
tree b131503019b98b49209e72ea126c93abded936db
parent 683ed6c3569e0347c1fa5ab7591c7fba27bb21e8

Only acquire FPM if feature is available

Test: Boot non-fp device, observe no wtf
Change-Id: If32b2370413f8bfe1477af52809c76e8c892cafa
Fixes: 32976626

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);