Merge "LockSettingsStrongAuth shouldn't get fingerprintservice on unsupported devices" into oc-mr1-dev am: fec9d20ed7

am: 35d78a9a54

Change-Id: I1c52a44e36815cf305e2fd23e09c597ea94db81a

1 files changed, 5 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/locksettings/LockSettingsStrongAuth.java b/services/core/java/com/android/server/locksettings/LockSettingsStrongAuth.java
index 542b929d85f5..c9c93293e2ee 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsStrongAuth.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsStrongAuth.java
@@ -27,6 +27,7 @@ import android.app.AlarmManager.OnAlarmListener;
 import android.app.admin.DevicePolicyManager;
 import android.app.trust.IStrongAuthTracker;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Binder;
 import android.os.DeadObjectException;
@@ -74,7 +75,10 @@ public class LockSettingsStrongAuth {
     }
 
     public void systemReady() {
-        mFingerprintManager = mContext.getSystemService(FingerprintManager.class);
+        final PackageManager pm = mContext.getPackageManager();
+        if (pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
+            mFingerprintManager = mContext.getSystemService(FingerprintManager.class);
+        }
     }
 
     private void handleAddStrongAuthTracker(IStrongAuthTracker tracker) {