Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23878956 authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge "Check PackageManager before getting <Biometric>Manager" into qt-dev 

am: ed8438ac

Change-Id: I912aca39c8f2b5d240c63450000e7260e5b354e1
parents abf4681e ed8438ac

services/core/java/com/android/server/stats/StatsCompanionService.java

+12 −2
Original line number Diff line number Diff line
@@ -1458,8 +1458,18 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 


    private void pullNumBiometricsEnrolled(int modality, int tagId, long elapsedNanos,

            long wallClockNanos, List<StatsLogEventWrapper> pulledData) {

        FingerprintManager fingerprintManager = mContext.getSystemService(FingerprintManager.class);

        FaceManager faceManager = mContext.getSystemService(FaceManager.class);

        final PackageManager pm = mContext.getPackageManager();

        FingerprintManager fingerprintManager = null;

        FaceManager faceManager = null;



        if (pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {

            fingerprintManager = mContext.getSystemService(

                    FingerprintManager.class);

        }

        if (pm.hasSystemFeature(PackageManager.FEATURE_FACE)) {

            faceManager = mContext.getSystemService(FaceManager.class);

        }



        if (modality == BiometricsProtoEnums.MODALITY_FINGERPRINT && fingerprintManager == null) {

            return;

        }