diff options
2 files changed, 5 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/biometrics/AuthenticationStatsCollector.java b/services/core/java/com/android/server/biometrics/AuthenticationStatsCollector.java index 4df25811cc99..5d609bca334c 100644 --- a/services/core/java/com/android/server/biometrics/AuthenticationStatsCollector.java +++ b/services/core/java/com/android/server/biometrics/AuthenticationStatsCollector.java @@ -54,8 +54,8 @@ public class AuthenticationStatsCollector { @NonNull private final Context mContext; @NonNull private final PackageManager mPackageManager; - @NonNull private final FaceManager mFaceManager; - @NonNull private final FingerprintManager mFingerprintManager; + @Nullable private final FaceManager mFaceManager; + @Nullable private final FingerprintManager mFingerprintManager; private final boolean mEnabled; private final float mThreshold; @@ -197,11 +197,11 @@ public class AuthenticationStatsCollector { } private boolean hasEnrolledFace(int userId) { - return mFaceManager.hasEnrolledTemplates(userId); + return mFaceManager != null && mFaceManager.hasEnrolledTemplates(userId); } private boolean hasEnrolledFingerprint(int userId) { - return mFingerprintManager.hasEnrolledTemplates(userId); + return mFingerprintManager != null && mFingerprintManager.hasEnrolledTemplates(userId); } /** diff --git a/services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsCollectorTest.java b/services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsCollectorTest.java index d2e83e9b0708..9eeb4f3f218f 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsCollectorTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/AuthenticationStatsCollectorTest.java @@ -271,6 +271,7 @@ public class AuthenticationStatsCollectorTest { .thenReturn(true); when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(false); when(mFingerprintManager.hasEnrolledTemplates(anyInt())).thenReturn(true); + when(mContext.getSystemService(Context.FACE_SERVICE)).thenReturn(null); mAuthenticationStatsCollector.authenticate(USER_ID_1, false /* authenticated */); |