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

Commit fec9d20e authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "LockSettingsStrongAuth shouldn't get fingerprintservice on unsupported... 

Merge "LockSettingsStrongAuth shouldn't get fingerprintservice on unsupported devices" into oc-mr1-dev
parents 213b5c74 a5ae2c2b

services/core/java/com/android/server/locksettings/LockSettingsStrongAuth.java

+5 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.app.AlarmManager.OnAlarmListener; 
import android.app.admin.DevicePolicyManager;

import android.app.trust.IStrongAuthTracker;

import android.content.Context;

import android.content.pm.PackageManager;

import android.hardware.fingerprint.FingerprintManager;

import android.os.Binder;

import android.os.DeadObjectException;
@@ -74,8 +75,11 @@ public class LockSettingsStrongAuth { 
    }



    public void systemReady() {

        final PackageManager pm = mContext.getPackageManager();

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

            mFingerprintManager = mContext.getSystemService(FingerprintManager.class);

        }

    }



    private void handleAddStrongAuthTracker(IStrongAuthTracker tracker) {

        for (int i = 0; i < mStrongAuthTrackers.size(); i++) {