Check PackageManager before getting system service
Fixes: 131285189
Test: manual
Change-Id: I17f4db85afc5969c58a0a08667ef05786302712b
(cherry picked from commit acc340d615b631391f61d470c2b798aab6188abb)
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java
index 1ffcb4c..70c00e5 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java
@@ -22,6 +22,8 @@
import android.hardware.face.FaceManager;
import android.provider.Settings;
+import com.android.settings.Utils;
+
import androidx.preference.Preference;
/**
@@ -40,7 +42,7 @@
public FaceSettingsAppPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
- mFaceManager = context.getSystemService(FaceManager.class);
+ mFaceManager = Utils.getFaceManagerOrNull(context);
}
public FaceSettingsAppPreferenceController(Context context) {
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceController.java
index 7dbe557..c65cd23 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceController.java
@@ -24,6 +24,7 @@
import androidx.preference.Preference;
+import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -46,7 +47,7 @@
public FaceSettingsConfirmPreferenceController(Context context,
String preferenceKey) {
super(context, preferenceKey);
- mFaceManager = context.getSystemService(FaceManager.class);
+ mFaceManager = Utils.getFaceManagerOrNull(context);
}
@Override
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceController.java
index 92eab85..c64455a 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceController.java
@@ -26,6 +26,7 @@
import androidx.preference.Preference;
+import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -44,7 +45,7 @@
public FaceSettingsKeyguardPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
- mFaceManager = context.getSystemService(FaceManager.class);
+ mFaceManager = Utils.getFaceManagerOrNull(context);
}
public FaceSettingsKeyguardPreferenceController(Context context) {
