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

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

Merge changes from topic "removeall-cts" into sc-dev 

* changes:
  Update removeAll test path
  Make FingerprintService/FaceService less chatty
  Update removeAll path
parents ca0ac5e6 07ac5fc5

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

+1 −5
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
         *

         * @param face The face template that was removed.

         */

        public void onRemovalSucceeded(Face face, int remaining) {

        public void onRemovalSucceeded(@Nullable Face face, int remaining) {

        }

    }
@@ -1258,10 +1258,6 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
        if (mRemovalCallback == null) {

            return;

        }

        if (face == null) {

            Slog.e(TAG, "Received MSG_REMOVED, but face is null");

            return;

        }

        mRemovalCallback.onRemovalSucceeded(face, remaining);

    }

core/java/android/hardware/face/FaceServiceReceiver.java

0 → 100644
+97 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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 android.hardware.face;



import android.os.RemoteException;



/**

 * Provides default methods for callers who only need a subset of the functionality.

 * @hide

 */

public class FaceServiceReceiver extends IFaceServiceReceiver.Stub {

    @Override

    public void onEnrollResult(Face face, int remaining) throws RemoteException {



    }



    @Override

    public void onAcquired(int acquiredInfo, int vendorCode) throws RemoteException {



    }



    @Override

    public void onAuthenticationSucceeded(Face face, int userId, boolean isStrongBiometric)

            throws RemoteException {



    }



    @Override

    public void onFaceDetected(int sensorId, int userId, boolean isStrongBiometric)

            throws RemoteException {



    }



    @Override

    public void onAuthenticationFailed() throws RemoteException {



    }



    @Override

    public void onError(int error, int vendorCode) throws RemoteException {



    }



    @Override

    public void onRemoved(Face face, int remaining) throws RemoteException {



    }



    @Override

    public void onFeatureSet(boolean success, int feature) throws RemoteException {



    }



    @Override

    public void onFeatureGet(boolean success, int feature, boolean value) throws RemoteException {



    }



    @Override

    public void onChallengeGenerated(int sensorId, long challenge) throws RemoteException {



    }



    @Override

    public void onChallengeInterrupted(int sensorId) throws RemoteException {



    }



    @Override

    public void onChallengeInterruptFinished(int sensorId) throws RemoteException {



    }



    @Override

    public void onAuthenticationFrame(FaceAuthenticationFrame frame) throws RemoteException {



    }



    @Override

    public void onEnrollmentFrame(FaceEnrollFrame frame) throws RemoteException {



    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing 
         *         {@link #remove} is called on a group, this should be the number of remaining

         *         fingerprints in the group, and 0 after the last fingerprint is removed.

         */

        public void onRemovalSucceeded(Fingerprint fp, int remaining) { }

        public void onRemovalSucceeded(@Nullable Fingerprint fp, int remaining) { }

    }



    /**

core/java/android/hardware/fingerprint/FingerprintServiceReceiver.java

0 → 100644
+77 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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 android.hardware.fingerprint;



import android.os.RemoteException;



/**

 * Provides default methods for callers who only need a subset of the functionality.

 * @hide

 */

public class FingerprintServiceReceiver extends IFingerprintServiceReceiver.Stub {

    @Override

    public void onEnrollResult(Fingerprint fp, int remaining) throws RemoteException {



    }



    @Override

    public void onAcquired(int acquiredInfo, int vendorCode) throws RemoteException {



    }



    @Override

    public void onAuthenticationSucceeded(Fingerprint fp, int userId, boolean isStrongBiometric)

            throws RemoteException {



    }



    @Override

    public void onFingerprintDetected(int sensorId, int userId, boolean isStrongBiometric)

            throws RemoteException {



    }



    @Override

    public void onAuthenticationFailed() throws RemoteException {



    }



    @Override

    public void onError(int error, int vendorCode) throws RemoteException {



    }



    @Override

    public void onRemoved(Fingerprint fp, int remaining) throws RemoteException {



    }



    @Override

    public void onChallengeGenerated(int sensorId, long challenge) throws RemoteException {



    }



    @Override

    public void onUdfpsPointerDown(int sensorId) throws RemoteException {



    }



    @Override

    public void onUdfpsPointerUp(int sensorId) throws RemoteException {



    }

}

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

+3 −5
Original line number Diff line number Diff line
@@ -65,12 +65,10 @@ public abstract class RemovalClient<S extends BiometricAuthenticator.Identifier, 
    }



    @Override

    public void onRemoved(@Nullable BiometricAuthenticator.Identifier identifier, int remaining) {

    public void onRemoved(@NonNull BiometricAuthenticator.Identifier identifier, int remaining) {

        Slog.d(TAG, "onRemoved: " + identifier.getBiometricId() + " remaining: " + remaining);

        if (identifier != null) {

        mBiometricUtils.removeBiometricForUser(getContext(), getTargetUserId(),

                identifier.getBiometricId());

        }



        try {

            if (getListener() != null) {