commit 1a3112ab32c2a050b339fbb194422a846baf8f2a
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 31 04:15:54 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 31 04:15:54 2019 +0000
tree dfa0db09cf5c1b7abcc48e1d6f67532dabfc7f59
parent dbe399a0236336fcae9852d050aa26b5b4d291d3
parent 8c29afdc3f8acaee90725abc5bf3a62f23314a19

Merge "Fix exception on non face-enabled devices" into qt-r1-dev

src/com/android/settings/security/LockscreenBypassPreferenceController.java

diff --git a/src/com/android/settings/security/LockscreenBypassPreferenceController.java b/src/com/android/settings/security/LockscreenBypassPreferenceController.java
index e347a73..dfa127b 100644
--- a/src/com/android/settings/security/LockscreenBypassPreferenceController.java
+++ b/src/com/android/settings/security/LockscreenBypassPreferenceController.java
@@ -17,6 +17,7 @@
 package com.android.settings.security;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.hardware.face.FaceManager;
 import android.provider.Settings;
 
@@ -30,7 +31,9 @@
 
     public LockscreenBypassPreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mFaceManager = context.getSystemService(FaceManager.class);
+        if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) {
+            mFaceManager = context.getSystemService(FaceManager.class);
+        }
     }
 
     @Override