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

Commit f4ede2bb authored by Ilya Matyukhin's avatar Ilya Matyukhin
Browse files

Retry fingerprint getService 

Also adds isUdfps to the dumped data.

Bug: 178053992
Test: build
Change-Id: Ic627494d8f2cae3575c893f6a5ccb207d959aa33
parent c09fc8dd

services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java

+8 −6
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider 
    @NonNull private final HalResultController mHalResultController;

    @Nullable private IUdfpsOverlayController mUdfpsOverlayController;

    private int mCurrentUserId = UserHandle.USER_NULL;

    private boolean mIsUdfps = false;

    private final int mSensorId;



    private final class BiometricTaskStackListener extends TaskStackListener {
@@ -335,21 +336,21 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider 
        }



        final IBiometricsFingerprint daemon = getDaemon();

        boolean isUdfps = false;

        mIsUdfps = false;

        android.hardware.biometrics.fingerprint.V2_3.IBiometricsFingerprint extension =

                android.hardware.biometrics.fingerprint.V2_3.IBiometricsFingerprint.castFrom(

                        daemon);

        if (extension != null) {

            try {

                isUdfps = extension.isUdfps(sensorId);

                mIsUdfps = extension.isUdfps(sensorId);

            } catch (RemoteException e) {

                Slog.e(TAG, "Remote exception while quering udfps", e);

                isUdfps = false;

                mIsUdfps = false;

            }

        }



        final @FingerprintSensorProperties.SensorType int sensorType =

                isUdfps ? FingerprintSensorProperties.TYPE_UDFPS_OPTICAL

                mIsUdfps ? FingerprintSensorProperties.TYPE_UDFPS_OPTICAL

                         : FingerprintSensorProperties.TYPE_REAR;

        // resetLockout is controlled by the framework, so hardwareAuthToken is not required

        final boolean resetLockoutRequiresHardwareAuthToken = false;
@@ -414,7 +415,7 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider 
        Slog.d(TAG, "Daemon was null, reconnecting, current operation: "

                + mScheduler.getCurrentClient());

        try {

            mDaemon = IBiometricsFingerprint.getService();

            mDaemon = IBiometricsFingerprint.getService(true /* retry */);

        } catch (java.util.NoSuchElementException e) {

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

            Slog.w(TAG, "NoSuchElementException", e);
@@ -799,6 +800,7 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider 
        JSONObject dump = new JSONObject();

        try {

            dump.put("service", TAG);

            dump.put("isUdfps", mIsUdfps);



            JSONArray sets = new JSONArray();

            for (UserInfo user : UserManager.get(mContext).getUsers()) {