Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check PackageManager before getting <Biometric>Manager

Browse Source 
Fixes: 130223578

Test: Builds
Change-Id: I2ed1ffe32bd67e4c21b486c2e90b4f18b024378b
This commit is contained in:
Kevin Chyn
2019-04-10 14:05:54 -07:00
parent dd07ae579c
commit b602c45231
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/stats/StatsCompanionService.java
View File

@@ -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;
}