From 8c29afdc3f8acaee90725abc5bf3a62f23314a19 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Thu, 30 May 2019 14:49:24 -0700 Subject: [PATCH] Fix exception on non face-enabled devices Test: open privacy settings page Bug: 130327302 Change-Id: I31ba9f30bb7300bff6daea8a51ed6c4dc2a373f2 --- .../security/LockscreenBypassPreferenceController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/security/LockscreenBypassPreferenceController.java b/src/com/android/settings/security/LockscreenBypassPreferenceController.java index e347a733adb..dfa127b3003 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 class LockscreenBypassPreferenceController extends TogglePreferenceContro 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