Merge "Fixed Settings Crash" into qt-r1-dev

am: 800e8a485f Change-Id: If6bba47ee6c16b035453c5f4a3fee38c0b1a0a1a
2019-07-15 13:10:52 -07:00
parent 4919b857e6 800e8a485f
commit d5cac4a3f6
2 changed files with 11 additions and 5 deletions
--- a/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java
@@ -54,7 +54,7 @@ public class FaceSetupSlice implements CustomSliceable {

    @Override
    public Slice getSlice() {
-        final FaceManager faceManager = mContext.getSystemService(FaceManager.class);
+        final FaceManager faceManager = Utils.getFaceManagerOrNull(mContext);
        if (faceManager == null || faceManager.hasEnrolledTemplates(UserHandle.myUserId())) {
            return null;
        }