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

Commit d43af4a4 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "Add get/set feature implementation" into sc-dev am: 1203a1c6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14202160

Change-Id: Ib0b894cacb0779d56ebf501f8e79fe94d11f9d1e
parents 84ed4186 1203a1c6

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

+8 −8
Original line number Diff line number Diff line
@@ -133,11 +133,11 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
        }



        @Override

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

        public void onFeatureGet(boolean success, int[] features, boolean[] featureState) {

            SomeArgs args = SomeArgs.obtain();

            args.arg1 = success;

            args.argi1 = feature;

            args.arg2 = value;

            args.arg2 = features;

            args.arg3 = featureState;

            mHandler.obtainMessage(MSG_GET_FEATURE_COMPLETED, args).sendToTarget();

        }
@@ -1088,7 +1088,7 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
     * @hide

     */

    public abstract static class GetFeatureCallback {

        public abstract void onCompleted(boolean success, int feature, boolean value);

        public abstract void onCompleted(boolean success, int[] features, boolean[] featureState);

    }



    /**
@@ -1179,8 +1179,8 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
                case MSG_GET_FEATURE_COMPLETED:

                    SomeArgs args = (SomeArgs) msg.obj;

                    sendGetFeatureCompleted((boolean) args.arg1 /* success */,

                            args.argi1 /* feature */,

                            (boolean) args.arg2 /* value */);

                            (int[]) args.arg2 /* features */,

                            (boolean[]) args.arg3 /* featureState */);

                    args.recycle();

                    break;

                case MSG_CHALLENGE_GENERATED:
@@ -1216,11 +1216,11 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan 
        mSetFeatureCallback.onCompleted(success, feature);

    }



    private void sendGetFeatureCompleted(boolean success, int feature, boolean value) {

    private void sendGetFeatureCompleted(boolean success, int[] features, boolean[] featureState) {

        if (mGetFeatureCallback == null) {

            return;

        }

        mGetFeatureCallback.onCompleted(success, feature, value);

        mGetFeatureCallback.onCompleted(success, features, featureState);

    }



    private void sendChallengeGenerated(int sensorId, long challenge) {

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

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ public class FaceServiceReceiver extends IFaceServiceReceiver.Stub { 
    }



    @Override

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

    public void onFeatureGet(boolean success, int[] features, boolean[] featureState)

                throws RemoteException {



    }

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

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ oneway interface IFaceServiceReceiver { 
    void onError(int error, int vendorCode);

    void onRemoved(in Face face, int remaining);

    void onFeatureSet(boolean success, int feature);

    void onFeatureGet(boolean success, int feature, boolean value);

    void onFeatureGet(boolean success, in int[] features, in boolean[] featureState);

    void onChallengeGenerated(int sensorId, long challenge);

    void onChallengeInterrupted(int sensorId);

    void onChallengeInterruptFinished(int sensorId);

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

+3 −2
Original line number Diff line number Diff line
@@ -146,9 +146,10 @@ public class ClientMonitorCallbackConverter { 
        }

    }



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

    public void onFeatureGet(boolean success, int[] features, boolean[] featureState)

            throws RemoteException {

        if (mFaceServiceReceiver != null) {

            mFaceServiceReceiver.onFeatureGet(success, feature, value);

            mFaceServiceReceiver.onFeatureGet(success, features, featureState);

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ public class BiometricTestSessionImpl extends ITestSession.Stub { 
        }



        @Override

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

        public void onFeatureGet(boolean success, int[] features, boolean[] featureState) {



        }