From d15bcdeb606bc2c68726a6513e4ecda6d5798f03 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Mon, 1 Oct 2018 17:47:35 -0700
Subject: [PATCH] Do PackageManager check before getting system service

Fixes: 117074737

Test: Does not crash
Change-Id: I51b04f46f8d467c3a854c132415a2cad90b77203
---
 .../face/FaceSettingsAttentionPreferenceController.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java
index e26f8813fca..9c4f964c7fd 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java
@@ -18,8 +18,8 @@ package com.android.settings.biometrics.face;
 
 import android.content.Context;
 import android.hardware.face.FaceManager;
-import android.util.Log;
 
+import com.android.settings.Utils;
 import com.android.settings.core.TogglePreferenceController;
 
 import androidx.preference.PreferenceScreen;
@@ -39,7 +39,7 @@ public class FaceSettingsAttentionPreferenceController extends TogglePreferenceC
 
     public FaceSettingsAttentionPreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mFaceManager = context.getSystemService(FaceManager.class);
+        mFaceManager = Utils.getFaceManagerOrNull(context);
     }
 
     public FaceSettingsAttentionPreferenceController(Context context) {