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

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

Merge changes from topic "authsession-cts-state" into sc-dev 

* changes:
  Go to STATE_AUTH_STARTED_UI_SHOWING if UI was already showing
  Update biometric test paths
parents e029492f a5ae7ebb

services/core/java/com/android/server/biometrics/AuthSession.java

+5 −1
Original line number Diff line number Diff line
@@ -257,11 +257,15 @@ public final class AuthSession implements IBinder.DeathRecipient { 
                            mUserId,

                            mOpPackageName,

                            mOperationId);

                    mState = STATE_AUTH_STARTED;

                } catch (RemoteException e) {

                    Slog.e(TAG, "Remote exception", e);

                }

            } else {

                // The UI was already showing :)

                mState = STATE_AUTH_STARTED_UI_SHOWING;

            }

            mState = STATE_AUTH_STARTED;



        }

    }

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

+5 −7
Original line number Diff line number Diff line
@@ -435,13 +435,7 @@ public class Sensor { 
        mScheduler = new BiometricScheduler(tag, null /* gestureAvailabilityDispatcher */);

        mLockoutCache = new LockoutCache();

        mAuthenticatorIds = new HashMap<>();

        mLazySession = () -> {

            if (mTestHalEnabled) {

                return new TestSession(mCurrentSession.mHalSessionCallback);

            } else {

                return mCurrentSession != null ? mCurrentSession.mSession : null;

            }

        };

        mLazySession = () -> mCurrentSession != null ? mCurrentSession.mSession : null;

    }



    @NonNull HalClientMonitor.LazyDaemon<ISession> getLazySession() {
@@ -497,6 +491,10 @@ public class Sensor { 


    void setTestHalEnabled(boolean enabled) {

        Slog.w(mTag, "setTestHalEnabled: " + enabled);

        if (enabled != mTestHalEnabled) {

            // The framework should retrieve a new session from the HAL.

            mCurrentSession = null;

        }

        mTestHalEnabled = enabled;

    }

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

+40 −12
Original line number Diff line number Diff line
@@ -17,12 +17,14 @@ 
package com.android.server.biometrics.sensors.face.aidl;



import android.hardware.biometrics.common.ICancellationSignal;

import android.hardware.biometrics.face.Error;

import android.hardware.biometrics.face.IFace;

import android.hardware.biometrics.face.ISession;

import android.hardware.biometrics.face.ISessionCallback;

import android.hardware.biometrics.face.SensorProps;

import android.hardware.common.NativeHandle;

import android.hardware.keymaster.HardwareAuthToken;

import android.os.RemoteException;

import android.util.Slog;



/**
@@ -38,70 +40,96 @@ public class TestHal extends IFace.Stub { 


    @Override

    public ISession createSession(int sensorId, int userId, ISessionCallback cb) {

        Slog.w(TAG, "createSession, sensorId: " + sensorId + " userId: " + userId);



        return new ISession.Stub() {

            @Override

            public void generateChallenge(int cookie, int timeoutSec) {

            public void generateChallenge(int cookie, int timeoutSec) throws RemoteException {

                Slog.w(TAG, "generateChallenge, cookie: " + cookie);

                cb.onChallengeGenerated(0L);

            }



            @Override

            public void revokeChallenge(int cookie, long challenge) {

            public void revokeChallenge(int cookie, long challenge) throws RemoteException {

                Slog.w(TAG, "revokeChallenge: " + challenge + ", cookie: " + cookie);

                cb.onChallengeRevoked(challenge);

            }



            @Override

            public ICancellationSignal enroll(int cookie, HardwareAuthToken hat,

                    byte enrollmentType, byte[] features, NativeHandle previewSurface) {

                Slog.w(TAG, "enroll, cookie: " + cookie);

                return null;

                return new ICancellationSignal.Stub() {

                    @Override

                    public void cancel() throws RemoteException {

                        cb.onError(Error.CANCELED, 0 /* vendorCode */);

                    }

                };

            }



            @Override

            public ICancellationSignal authenticate(int cookie, long operationId) {

                Slog.w(TAG, "authenticate, cookie: " + cookie);

                return null;

                return new ICancellationSignal.Stub() {

                    @Override

                    public void cancel() throws RemoteException {

                        cb.onError(Error.CANCELED, 0 /* vendorCode */);

                    }

                };

            }



            @Override

            public ICancellationSignal detectInteraction(int cookie) {

                Slog.w(TAG, "detectInteraction, cookie: " + cookie);

                return null;

                return new ICancellationSignal.Stub() {

                    @Override

                    public void cancel() throws RemoteException {

                        cb.onError(Error.CANCELED, 0 /* vendorCode */);

                    }

                };

            }



            @Override

            public void enumerateEnrollments(int cookie) {

            public void enumerateEnrollments(int cookie) throws RemoteException {

                Slog.w(TAG, "enumerateEnrollments, cookie: " + cookie);

                cb.onEnrollmentsEnumerated(new int[0]);

            }



            @Override

            public void removeEnrollments(int cookie, int[] enrollmentIds) {

            public void removeEnrollments(int cookie, int[] enrollmentIds) throws RemoteException {

                Slog.w(TAG, "removeEnrollments, cookie: " + cookie);

                cb.onEnrollmentsRemoved(enrollmentIds);

            }



            @Override

            public void getFeatures(int cookie, int enrollmentId) {

            public void getFeatures(int cookie, int enrollmentId) throws RemoteException {

                Slog.w(TAG, "getFeatures, cookie: " + cookie);

                cb.onFeaturesRetrieved(new byte[0], enrollmentId);

            }



            @Override

            public void setFeature(int cookie, HardwareAuthToken hat, int enrollmentId,

                    byte feature, boolean enabled) {

                    byte feature, boolean enabled) throws RemoteException {

                Slog.w(TAG, "setFeature, cookie: " + cookie);

                cb.onFeatureSet(enrollmentId, feature);

            }



            @Override

            public void getAuthenticatorId(int cookie) {

            public void getAuthenticatorId(int cookie) throws RemoteException {

                Slog.w(TAG, "getAuthenticatorId, cookie: " + cookie);

                cb.onAuthenticatorIdRetrieved(0L);

            }



            @Override

            public void invalidateAuthenticatorId(int cookie) {

            public void invalidateAuthenticatorId(int cookie) throws RemoteException {

                Slog.w(TAG, "invalidateAuthenticatorId, cookie: " + cookie);

                cb.onAuthenticatorIdInvalidated(0L);

            }



            @Override

            public void resetLockout(int cookie, HardwareAuthToken hat) {

            public void resetLockout(int cookie, HardwareAuthToken hat) throws RemoteException {

                Slog.w(TAG, "resetLockout, cookie: " + cookie);

                cb.onLockoutCleared();

            }

        };

    }

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

deleted100644 → 0
+0 −117
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.biometrics.sensors.face.aidl;



import android.annotation.NonNull;

import android.hardware.biometrics.common.ICancellationSignal;

import android.hardware.biometrics.face.Error;

import android.hardware.biometrics.face.ISession;

import android.hardware.common.NativeHandle;

import android.hardware.keymaster.HardwareAuthToken;

import android.os.Binder;

import android.os.IBinder;

import android.util.Slog;



/**

 * Test session that provides mostly no-ops.

 */

public class TestSession extends ISession.Stub {

    private static final String TAG = "FaceTestSession";



    @NonNull

    private final Sensor.HalSessionCallback mHalSessionCallback;



    TestSession(@NonNull Sensor.HalSessionCallback halSessionCallback) {

        mHalSessionCallback = halSessionCallback;

    }



    @Override

    public void generateChallenge(int cookie, int timeoutSec) {

        mHalSessionCallback.onChallengeGenerated(0 /* challenge */);

    }



    @Override

    public void revokeChallenge(int cookie, long challenge) {

        mHalSessionCallback.onChallengeRevoked(challenge);

    }



    @Override

    public ICancellationSignal enroll(int cookie, HardwareAuthToken hat, byte enrollmentType,

            byte[] features, NativeHandle previewSurface) {

        return null;

    }



    @Override

    public ICancellationSignal authenticate(int cookie, long operationId) {

        return new ICancellationSignal() {

            @Override

            public void cancel() {

                mHalSessionCallback.onError(Error.CANCELED, 0 /* vendorCode */);

            }



            @Override

            public IBinder asBinder() {

                return new Binder();

            }

        };

    }



    @Override

    public ICancellationSignal detectInteraction(int cookie) {

        return null;

    }



    @Override

    public void enumerateEnrollments(int cookie) {



    }



    @Override

    public void removeEnrollments(int cookie, int[] enrollmentIds) {



    }



    @Override

    public void getFeatures(int cookie, int enrollmentId) {



    }



    @Override

    public void setFeature(int cookie, HardwareAuthToken hat, int enrollmentId, byte feature,

            boolean enabled) {



    }



    @Override

    public void getAuthenticatorId(int cookie) {

        Slog.d(TAG, "getAuthenticatorId");

        // Immediately return a value so the framework can continue with subsequent requests.

        mHalSessionCallback.onAuthenticatorIdRetrieved(0);

    }



    @Override

    public void invalidateAuthenticatorId(int cookie) {

        Slog.d(TAG, "invalidateAuthenticatorId");

        // Immediately return a value so the framework can continue with subsequent requests.

        mHalSessionCallback.onAuthenticatorIdInvalidated(0);

    }



    @Override

    public void resetLockout(int cookie, HardwareAuthToken hat) {

        mHalSessionCallback.onLockoutCleared();

    }

}

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

+4 −1
Original line number Diff line number Diff line
@@ -98,8 +98,11 @@ public class TestHal extends IBiometricsFace.Stub { 
    }



    @Override

    public int enumerate() {

    public int enumerate() throws RemoteException {

        Slog.w(TAG, "enumerate");

        if (mCallback != null) {

            mCallback.onEnumerate(0 /* deviceId */, new ArrayList<>(), 0 /* userId */);

        }

        return 0;

    }