diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2016-11-22 13:45:17 +0100 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2016-11-23 10:25:48 +0000 |
| commit | 3f12426d006bc1bd51b59601de1ccc558227687b (patch) | |
| tree | b131503019b98b49209e72ea126c93abded936db /packages/Keyguard | |
| parent | 683ed6c3569e0347c1fa5ab7591c7fba27bb21e8 (diff) | |
Only acquire FPM if feature is available
Test: Boot non-fp device, observe no wtf
Change-Id: If32b2370413f8bfe1477af52809c76e8c892cafa
Fixes: 32976626
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index 6a2949a5ed9f..cdcc05c65e98 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); |