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

Commit 9c5c5301 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Do not start fingerprint HAL if it is unstartable" into main

parents ea87f325 5215e9f2

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

+5 −0
Original line number Diff line number Diff line
@@ -121,6 +121,11 @@ public class FingerprintUpdateActiveUserClient extends StartUserClient<ISession, 
            final int targetId = getTargetUserId();

            Slog.d(TAG, "Setting active user: " + targetId);

            HidlToAidlSessionAdapter sessionAdapter = (HidlToAidlSessionAdapter) getFreshDaemon();

            if (sessionAdapter.getIBiometricsFingerprint() == null) {

                Slog.e(TAG, "Failed to setActiveGroup: HIDL daemon is null.");

                mCallback.onClientFinished(this, false /* success */);

                return;

            }

            sessionAdapter.setActiveGroup(targetId, mDirectory.getAbsolutePath());

            mAuthenticatorIds.put(targetId, mHasEnrolledBiometrics

                    ? sessionAdapter.getAuthenticatorIdForUpdateClient() : 0L);

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

+4 −0
Original line number Diff line number Diff line
@@ -209,6 +209,10 @@ public class HidlToAidlSessionAdapter implements ISession { 
        return null;

    }



    protected IBiometricsFingerprint getIBiometricsFingerprint() {

        return mSession.get();

    }



    public long getAuthenticatorIdForUpdateClient() throws RemoteException {

        return mSession.get().getAuthenticatorId();

    }