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

Commit 50c8d5c8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not start fingerprint HAL if it is unstartable" into main am: 9c5c5301 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3210850



Change-Id: I0748cfaeee21be78b03cdf0364b8ad362c37f62f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6f3194b 9c5c5301

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();

    }