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

Commit c20873a2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Check FEATURE_FINGERPRINT before trying to getSystemService"

parents f8a6f1da 5596642a

keystore/java/android/security/KeyStore.java

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.ActivityThread; 
import android.app.Application;

import android.app.KeyguardManager;

import android.content.Context;

import android.content.pm.PackageManager;

import android.hardware.fingerprint.FingerprintManager;

import android.os.Binder;

import android.os.IBinder;
@@ -762,6 +763,10 @@ public class KeyStore { 
    }



    private long getFingerprintOnlySid() {

        final PackageManager packageManager = mContext.getPackageManager();

        if (!packageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {

            return 0;

        }

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

        if (fingerprintManager == null) {

            return 0;