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

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

Merge "IBiometricsFingerprint uses "default" service name"

parents bdc813a6 25d5eaa1

services/core/java/com/android/server/fingerprint/FingerprintService.java

+1 −2
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ public class FingerprintService extends SystemService implements IHwBinder.Death 
    static final String TAG = "FingerprintService";

    static final boolean DEBUG = true;

    private static final String FP_DATA_DIR = "fpdata";

    private static final String FINGERPRINT_HIDL = "fingerprint_hal";

    private static final int MSG_USER_SWITCHING = 10;

    private static final String ACTION_LOCKOUT_RESET =

            "com.android.server.fingerprint.ACTION_LOCKOUT_RESET";
@@ -219,7 +218,7 @@ public class FingerprintService extends SystemService implements IHwBinder.Death 
    public synchronized IBiometricsFingerprint getFingerprintDaemon() {

        if (mDaemon == null) {

            try {

                mDaemon = IBiometricsFingerprint.getService(FINGERPRINT_HIDL);

                mDaemon = IBiometricsFingerprint.getService();

            } catch (java.util.NoSuchElementException e) {

                // Service doesn't exist or cannot be opened. Logged below.

            } catch (RemoteException e) {