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

Commit 36f539e5 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge changes from topic "clientmonitor-cleanup5" 

* changes:
  29/n: Fix EnrollClient onClientFinished
  28/n: Move authenticatorId update to RemovalClient
  27/n: Slightly update/fix ClientMonitor.FinishCallback
  26/n: Move ClientActiveCallbacks to its own file
  25/n: Make InternalCleanupClient generics/templates more correct
  24/n: Use lazy retrieval for HAL
  23/n: Move LockoutResetCallback tracking to its own class
parents 24c1ed2e 099b44a9

core/java/android/hardware/face/FaceManager.java

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
                                    serverCallback.sendResult(null /* data */);

                                }

                            }

                        });

                        }, mContext.getOpPackageName());

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

core/java/android/hardware/face/IFaceService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ interface IFaceService { 
    void resetLockout(int userId, in byte [] hardwareAuthToken);



    // Add a callback which gets notified when the face lockout period expired.

    void addLockoutResetCallback(IBiometricServiceLockoutResetCallback callback);

    void addLockoutResetCallback(IBiometricServiceLockoutResetCallback callback, String opPackageName);



    void setFeature(IBinder token, int userId, int feature, boolean enabled,

            in byte [] hardwareAuthToken, IFaceServiceReceiver receiver, String opPackageName);

core/java/android/hardware/fingerprint/FingerprintManager.java

+1 −1
Original line number Diff line number Diff line
@@ -768,7 +768,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing 
                            serverCallback.sendResult(null /* data */);

                        }

                    }

                });

                }, mContext.getOpPackageName());

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

core/java/android/hardware/fingerprint/IFingerprintService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ interface IFingerprintService { 
    void resetLockout(int userId, in byte [] hardwareAuthToken);



    // Add a callback which gets notified when the fingerprint lockout period expired.

    void addLockoutResetCallback(IBiometricServiceLockoutResetCallback callback);

    void addLockoutResetCallback(IBiometricServiceLockoutResetCallback callback, String opPackageName);



    // Check if a client request is currently being handled

    boolean isClientActive();

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

+11 −6
Original line number Diff line number Diff line
@@ -47,12 +47,17 @@ public abstract class AcquisitionClient<T> extends ClientMonitor<T> 
    private final VibrationEffect mSuccessVibrationEffect;

    private final VibrationEffect mErrorVibrationEffect;



    AcquisitionClient(@NonNull Context context, @NonNull IBinder token,

            @NonNull ClientMonitorCallbackConverter listener, int userId,

    /**

     * Stops the HAL operation specific to the ClientMonitor subclass.

     */

    protected abstract void stopHalOperation();



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

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

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

            int statsAction, int statsClient) {

        super(context, token, listener, userId, owner, cookie, sensorId, statsModality, statsAction,

                statsClient);

        super(context, lazyDaemon, token, listener, userId, owner, cookie, sensorId, statsModality,

                statsAction, statsClient);

        mPowerManager = context.getSystemService(PowerManager.class);

        mSuccessVibrationEffect = VibrationEffect.get(VibrationEffect.EFFECT_CLICK);

        mErrorVibrationEffect = VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK);
@@ -78,7 +83,7 @@ public abstract class AcquisitionClient<T> extends ClientMonitor<T> 
        } catch (RemoteException e) {

            Slog.w(TAG, "Failed to invoke sendError", e);

        }

        mFinishCallback.onClientFinished(this);

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

    }



    /**
@@ -110,7 +115,7 @@ public abstract class AcquisitionClient<T> extends ClientMonitor<T> 
            }

        } catch (RemoteException e) {

            Slog.w(TAG, "Failed to invoke sendAcquired", e);

            mFinishCallback.onClientFinished(this);

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

        }

    }