Merge "Fix exception on non face-enabled devices" into qt-r1-dev am: 1a3112ab32 (ff5dde9f) · Commits · e / os / android_packages_apps_Settings

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -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,8 +31,10 @@ public class LockscreenBypassPreferenceController extends TogglePreferenceContro

		public LockscreenBypassPreferenceController(Context context, String preferenceKey) {
		super(context, preferenceKey);
		if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) {
		mFaceManager = context.getSystemService(FaceManager.class);
		}
		}

		@Override
		public boolean isChecked() {