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

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

Merge changes from topic "face-hidl" 

* changes:
  Address HIDL review comments
  Add SENSOR_DIRTY constant
parents 785f27e8 6424d7ea

biometrics/face/1.0/IBiometricsFace.hal

+5 −3
Original line number Diff line number Diff line
@@ -59,7 +59,9 @@ interface IBiometricsFace { 
     *

     * @param userId A non-negative user identifier that must be unique and

     *     persistent for a given user.

     * @param storePath filesystem path to the template storage directory.

     * @param storePath absolute filesystem path to the template storage

     *     directory. This must be the /data/vendor_de/<user>/facedata

     *     directory specified by the SeLinux policy.

     */

    @callflow(next={"authenticate", "generateChallenge", "enumerate", "remove"})

    setActiveUser(int32_t userId, string storePath) generates (Status status);
@@ -159,8 +161,8 @@ interface IBiometricsFace { 
     * @param enabled True to enable the feature, false to disable.

     * @param hat A valid Hardware Authentication Token, generated as a result

     *     of getChallenge().

     * @param faceId the ID of the enrollment returned by enroll() for the

     *     feature to update.

     * @param faceId the ID of the enrollment returned by onEnrollResult() for

     *     the feature to update.

     * @return status The status of this method call.

     */

    setFeature(Feature feature, bool enabled, vec<uint8_t> hat, uint32_t faceId)

biometrics/face/1.0/IBiometricsFaceClientCallback.hal

+2 −5
Original line number Diff line number Diff line
@@ -95,13 +95,10 @@ interface IBiometricsFaceClientCallback { 
     *

     * @param deviceId A unique id associated with the HAL implementation

     *     service that processed this removal.

     * @param faceId The id of the face template that was removed.

     * @param removed A list of ids that were removed.

     * @param userId The active user id for the removed face template.

     * @param remaining The number of face templates remaining after this

     *     removal, or 0 if there are no more.

     */

    oneway onRemoved(uint64_t deviceId, uint32_t faceId, int32_t userId,

        uint32_t remaining);

    oneway onRemoved(uint64_t deviceId, vec<uint32_t> removed, int32_t userId);



    /**

     * A callback invoked to enumerate all current face templates.

biometrics/face/1.0/types.hal

+7 −2
Original line number Diff line number Diff line
@@ -339,10 +339,15 @@ enum FaceAcquiredInfo : int32_t { 
     */

    START = 20,



    /**

     * The sensor is dirty. The user should be informed to clean the sensor.

     */

    SENSOR_DIRTY = 21,



    /**

     * Used to enable a vendor-specific acquisition message.

     */

    VENDOR = 21

    VENDOR = 22

};



/**

biometrics/face/1.0/vts/functional/VtsHalBiometricsFaceV1_0TargetTest.cpp

+2 −5
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ class FaceCallbackBase : public IBiometricsFaceClientCallback { 
        return Return<void>();

    }



    Return<void> onRemoved(uint64_t, uint32_t, int32_t, uint32_t) override {

    Return<void> onRemoved(uint64_t, const hidl_vec<uint32_t>&, int32_t) override {

        ALOGD("Removed callback called.");

        return Return<void>();

    }
@@ -155,12 +155,9 @@ class RemoveCallback : public FaceCallbackBase { 
  public:

    explicit RemoveCallback(int32_t userId) : removeUserId(userId) {}



    Return<void> onRemoved(uint64_t, uint32_t, int32_t userId, uint32_t remaining) override {

    Return<void> onRemoved(uint64_t, const hidl_vec<uint32_t>&, int32_t userId) override {

        EXPECT_EQ(removeUserId, userId);

        promise.set_value();

        if (remaining == 0UL) {

            promise.set_value();

        }

        return Return<void>();

    }

current.txt

+3 −3
Original line number Diff line number Diff line
@@ -436,9 +436,9 @@ ca15a738dedc2f4981925f7d7ff29c22bc3f8a848403dcf0c592c167de09d9af android.hardwar 
443659bb9e27221e5da0d16c7a0ecb2dc3a9a03acc8a0b2196b47c50735e2d2e android.hardware.audio.effect@5.0::IVirtualizerEffect

78fed26a781cdca1b3bcb37520bff705d7764ee81db9cfd37014953c7ad2596e android.hardware.audio.effect@5.0::IVisualizerEffect

6385b6accab8a544e2ee54ba7bf5aa55dff6153bcedd80fdaae16fe9e0be7050 android.hardware.audio.effect@5.0::types

baf5a0cbf357035394be02d87334890228338fae715f7ab06e2f0e7d05abe656 android.hardware.biometrics.face@1.0::IBiometricsFace

6cbf288d6e6a9f6f0c09d1cde66318aa5b6a8c525778a61ccaedddb090f5e9cb android.hardware.biometrics.face@1.0::IBiometricsFaceClientCallback

ef5d339413d0c94a5b58baafbe3e4bccfd9ed2e7328fbbb5c25471c79923ed2f android.hardware.biometrics.face@1.0::types

e18ff318f3fc43db37f554696dc4e551abb9b119bde53950f73e28ce33a97a40 android.hardware.biometrics.face@1.0::IBiometricsFace

b6e55d7795bbafd011fb95a3b6d3954bf66c349e14cf107f3b72032ce3ceb448 android.hardware.biometrics.face@1.0::IBiometricsFaceClientCallback

95aa2f59e29e2f84d8e84320ace9b6682b426a16e897b4bd241375cbee0e07f3 android.hardware.biometrics.face@1.0::types

ecedc58dbcdb13503c19c0ab160ac1dd0530bb1471164149282dd1463c684185 android.hardware.bluetooth.audio@2.0::IBluetoothAudioPort

fb9c40e4deab40be5476477078fe3d8a4a4495fd9deef4321878d169d675c633 android.hardware.bluetooth.audio@2.0::IBluetoothAudioProvider

f7431f3e3e4e3387fc6f27a6cf423eddcd824a395dc4349d302c995ab44a9895 android.hardware.bluetooth.audio@2.0::IBluetoothAudioProvidersFactory