From 3f12426d006bc1bd51b59601de1ccc558227687b Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Tue, 22 Nov 2016 13:45:17 +0100 Subject: [PATCH] Only acquire FPM if feature is available Test: Boot non-fp device, observe no wtf Change-Id: If32b2370413f8bfe1477af52809c76e8c892cafa Fixes: 32976626 --- .../src/com/android/keyguard/KeyguardUpdateMonitor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index 6a2949a5ed9f8..cdcc05c65e985 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -1112,7 +1112,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 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);