commit 8c29afdc3f8acaee90725abc5bf3a62f23314a19
author Lucas Dupin <dupin@google.com> Thu May 30 14:49:24 2019 -0700
committer Lucas Dupin <dupin@google.com> Thu May 30 14:58:52 2019 -0700
tree 95dba6aa37d09559c56d72f0c0c77dc42e51d88d
parent 72182e1ffceb81872f349590c8a4d238299f987c

Fix exception on non face-enabled devices

Test: open privacy settings page
Bug: 130327302
Change-Id: I31ba9f30bb7300bff6daea8a51ed6c4dc2a373f2

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