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

Commit 82a7c8e5 authored by Joe Bolinger's avatar Joe Bolinger
Browse files

Remove useless type. 

Replace with standard jvm type.

Bug: 204585936
Test: Builds
Change-Id: Icd0be731236d417d5c3675982c6ee0a035f4240f
parent 26cdbb14

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

+3 −1
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ import android.os.VibrationEffect; 
import android.os.Vibrator;

import android.util.Slog;



import java.util.function.Supplier;



/**

 * Abstract {@link HalClientMonitor} subclass that operations eligible/interested in acquisition

 * messages should extend.
@@ -57,7 +59,7 @@ public abstract class AcquisitionClient<T> extends HalClientMonitor<T> implement 
     */

    protected abstract void stopHalOperation();



    public AcquisitionClient(@NonNull Context context, @NonNull LazyDaemon<T> lazyDaemon,

    public AcquisitionClient(@NonNull Context context, @NonNull Supplier<T> lazyDaemon,

            @NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener, int userId,

            @NonNull String owner, int cookie, int sensorId, boolean shouldVibrate,

            int statsModality, int statsAction, int statsClient) {

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

+2 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.server.biometrics.Utils; 


import java.util.ArrayList;

import java.util.List;

import java.util.function.Supplier;



/**

 * A class to keep track of the authentication state for a given client.
@@ -105,7 +106,7 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> 
     */

    public abstract boolean wasUserDetected();



    public AuthenticationClient(@NonNull Context context, @NonNull LazyDaemon<T> lazyDaemon,

    public AuthenticationClient(@NonNull Context context, @NonNull Supplier<T> lazyDaemon,

            @NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener,

            int targetUserId, long operationId, boolean restricted, @NonNull String owner,

            int cookie, boolean requireConfirmation, int sensorId, boolean isStrongBiometric,

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

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.util.Slog; 
import com.android.server.biometrics.BiometricsProto;



import java.util.Arrays;

import java.util.function.Supplier;



/**

 * A class to keep track of the enrollment state for a given client.
@@ -49,7 +50,7 @@ public abstract class EnrollClient<T> extends AcquisitionClient<T> implements En 
     */

    protected abstract boolean hasReachedEnrollmentLimit();



    public EnrollClient(@NonNull Context context, @NonNull LazyDaemon<T> lazyDaemon,

    public EnrollClient(@NonNull Context context, @NonNull Supplier<T> lazyDaemon,

            @NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener, int userId,

            @NonNull byte[] hardwareAuthToken, @NonNull String owner, @NonNull BiometricUtils utils,

            int timeoutSec, int statsModality, int sensorId, boolean shouldVibrate) {

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

+3 −1
Original line number Diff line number Diff line
@@ -25,11 +25,13 @@ import android.util.Slog; 


import com.android.server.biometrics.BiometricsProto;



import java.util.function.Supplier;



public abstract class GenerateChallengeClient<T> extends HalClientMonitor<T> {



    private static final String TAG = "GenerateChallengeClient";



    public GenerateChallengeClient(@NonNull Context context, @NonNull LazyDaemon<T> lazyDaemon,

    public GenerateChallengeClient(@NonNull Context context, @NonNull Supplier<T> lazyDaemon,

            @NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener,

            int userId, @NonNull String owner, int sensorId) {

        super(context, lazyDaemon, token, listener, userId, owner, 0 /* cookie */, sensorId,

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

+5 −12
Original line number Diff line number Diff line
@@ -22,20 +22,13 @@ import android.content.Context; 
import android.hardware.biometrics.BiometricsProtoEnums;

import android.os.IBinder;



import java.util.function.Supplier;



/**

 * Abstract {@link BaseClientMonitor} implementation that supports HAL operations.

 * @param <T> HAL template

 */

public abstract class HalClientMonitor<T> extends BaseClientMonitor {

    /**

     * Interface that allows ClientMonitor subclasses to retrieve a fresh instance to the HAL.

     */

    public interface LazyDaemon<T> {

        /**

         * @return A fresh instance to the biometric HAL

         */

        T getDaemon();

    }



    /**

     * Starts the HAL operation specific to the ClientMonitor subclass.
@@ -50,7 +43,7 @@ public abstract class HalClientMonitor<T> extends BaseClientMonitor { 
    public abstract void unableToStart();



    @NonNull

    protected final LazyDaemon<T> mLazyDaemon;

    protected final Supplier<T> mLazyDaemon;



    /**

     * @param context    system_server context
@@ -65,7 +58,7 @@ public abstract class HalClientMonitor<T> extends BaseClientMonitor { 
     * @param statsAction   One of {@link BiometricsProtoEnums} ACTION_* constants

     * @param statsClient   One of {@link BiometricsProtoEnums} CLIENT_* constants

     */

    public HalClientMonitor(@NonNull Context context, @NonNull LazyDaemon<T> lazyDaemon,

    public HalClientMonitor(@NonNull Context context, @NonNull Supplier<T> lazyDaemon,

            @Nullable IBinder token, @Nullable ClientMonitorCallbackConverter listener, int userId,

            @NonNull String owner, int cookie, int sensorId, int statsModality, int statsAction,

            int statsClient) {
@@ -76,6 +69,6 @@ public abstract class HalClientMonitor<T> extends BaseClientMonitor { 


    @Nullable

    public T getFreshDaemon() {

        return mLazyDaemon.getDaemon();

        return mLazyDaemon.get();

    }

}