Merge "Fixed Settings Crash" into qt-r1-dev am: 800e8a485f

am: d5cac4a3f6 Change-Id: I4cbc1adb869d6ca988827c6bdbd2106ab089c82c
2019-07-15 13:22:30 -07:00
parent 725b236039 d5cac4a3f6
commit b441c8ab91
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;
        }