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

Commit bd4cd387 authored by Joe Bolinger's avatar Joe Bolinger
Browse files

Check current user when the operations runs for fingerprint hidl. 

The current and target user are both provided to the switch
client constructor which is brittle unless operations are scheduled and
run synchronously. Commit 9a995038
changed the handlers and somehow caused a bug where the cached current
user was out of sync. The switch client tries to optimize for this and
can skip switching when that occurs.

This also includes two additonal changes 1) a few updated logs from
the original change and 2) restores each scheduling having its own
handler for clarity.

Bug: 213962104
Test: atest UserAwareBiometricSchedulerTest BiometricSchedulerTest BiometricSchedulerOperationTest  SensorTest Face10Test
Test: manual (flash, enroll fingerprint, add work profile account, reboot, verify fingerprint still works)
Change-Id: Ifb73b0145aeb8afb62d1f55d2f881347b0d2ef8a
parent 44664404

services/core/java/com/android/server/biometrics/sensors/BiometricScheduler.java

+5 −6
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.hardware.biometrics.IBiometricService; 
import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.util.Slog;
@@ -232,17 +233,14 @@ public class BiometricScheduler { 
     * Creates a new scheduler.

     *

     * @param tag for the specific instance of the scheduler. Should be unique.

     * @param handler handler for callbacks (all methods of this class must be called on the

     *                thread associated with this handler)

     * @param sensorType the sensorType that this scheduler is handling.

     * @param gestureAvailabilityDispatcher may be null if the sensor does not support gestures

     *                                      (such as fingerprint swipe).

     */

    public BiometricScheduler(@NonNull String tag,

            @NonNull Handler handler,

            @SensorType int sensorType,

            @Nullable GestureAvailabilityDispatcher gestureAvailabilityDispatcher) {

        this(tag, handler, sensorType, gestureAvailabilityDispatcher,

        this(tag, new Handler(Looper.getMainLooper()), sensorType, gestureAvailabilityDispatcher,

                IBiometricService.Stub.asInterface(

                        ServiceManager.getService(Context.BIOMETRIC_SERVICE)),

                LOG_NUM_RECENT_OPERATIONS, CoexCoordinator.getInstance());
@@ -376,8 +374,9 @@ public class BiometricScheduler { 
        // send ERROR_CANCELED and skip the operation.

        if (clientMonitor.interruptsPrecedingClients()) {

            for (BiometricSchedulerOperation operation : mPendingOperations) {

                if (operation.markCanceling()) {

                    Slog.d(getTag(), "New client, marking pending op as canceling: " + operation);

                operation.markCanceling();

                }

            }

        }

services/core/java/com/android/server/biometrics/sensors/BiometricSchedulerOperation.java

+5 −3
Original line number Diff line number Diff line
@@ -225,12 +225,13 @@ public class BiometricSchedulerOperation { 
        Slog.v(TAG, "Aborted: " + this);

    }



    /** Flags this operation as canceled, but does not cancel it until started. */

    public void markCanceling() {

    /** Flags this operation as canceled, if possible, but does not cancel it until started. */

    public boolean markCanceling() {

        if (mState == STATE_WAITING_IN_QUEUE && isInterruptable()) {

            mState = STATE_WAITING_IN_QUEUE_CANCELING;

            Slog.v(TAG, "Marked cancelling: " + this);

            return true;

        }

        return false;

    }



    /**
@@ -280,6 +281,7 @@ public class BiometricSchedulerOperation { 
            @Override

            public void onClientFinished(@NonNull BaseClientMonitor clientMonitor,

                    boolean success) {

                Slog.d(TAG, "[Finished / destroy]: " + clientMonitor);

                mClientMonitor.destroy();

                mState = STATE_FINISHED;

            }

services/core/java/com/android/server/biometrics/sensors/UserAwareBiometricScheduler.java

+3 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.Nullable; 
import android.content.Context;

import android.hardware.biometrics.IBiometricService;

import android.os.Handler;

import android.os.Looper;

import android.os.ServiceManager;

import android.os.UserHandle;

import android.util.Slog;
@@ -85,7 +86,7 @@ public class UserAwareBiometricScheduler extends BiometricScheduler { 
    }



    @VisibleForTesting

    UserAwareBiometricScheduler(@NonNull String tag,

    public UserAwareBiometricScheduler(@NonNull String tag,

            @NonNull Handler handler,

            @SensorType int sensorType,

            @Nullable GestureAvailabilityDispatcher gestureAvailabilityDispatcher,
@@ -101,12 +102,11 @@ public class UserAwareBiometricScheduler extends BiometricScheduler { 
    }



    public UserAwareBiometricScheduler(@NonNull String tag,

            @NonNull Handler handler,

            @SensorType int sensorType,

            @Nullable GestureAvailabilityDispatcher gestureAvailabilityDispatcher,

            @NonNull CurrentUserRetriever currentUserRetriever,

            @NonNull UserSwitchCallback userSwitchCallback) {

        this(tag, handler, sensorType, gestureAvailabilityDispatcher,

        this(tag, new Handler(Looper.getMainLooper()), sensorType, gestureAvailabilityDispatcher,

                IBiometricService.Stub.asInterface(

                        ServiceManager.getService(Context.BIOMETRIC_SERVICE)),

                currentUserRetriever, userSwitchCallback, CoexCoordinator.getInstance());

services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ public class Sensor { 
        mToken = new Binder();

        mHandler = handler;

        mSensorProperties = sensorProperties;

        mScheduler = new UserAwareBiometricScheduler(tag, mHandler,

        mScheduler = new UserAwareBiometricScheduler(tag,

                BiometricScheduler.SENSOR_TYPE_FACE, null /* gestureAvailabilityDispatcher */,

                () -> mCurrentSession != null ? mCurrentSession.mUserId : UserHandle.USER_NULL,

                new UserAwareBiometricScheduler.UserSwitchCallback() {

services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java

+3 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ public class Face10 implements IHwBinder.DeathRecipient, ServiceProvider { 
            @NonNull LockoutResetDispatcher lockoutResetDispatcher) {

        final Handler handler = new Handler(Looper.getMainLooper());

        return new Face10(context, sensorProps, lockoutResetDispatcher, handler,

                new BiometricScheduler(TAG, handler, BiometricScheduler.SENSOR_TYPE_FACE,

                new BiometricScheduler(TAG, BiometricScheduler.SENSOR_TYPE_FACE,

                        null /* gestureAvailabilityTracker */));

    }
@@ -896,6 +896,8 @@ public class Face10 implements IHwBinder.DeathRecipient, ServiceProvider { 
                    boolean success) {

                if (success) {

                    mCurrentUserId = targetUserId;

                } else {

                    Slog.w(TAG, "Failed to change user, still: " + mCurrentUserId);

                }

            }

        });