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

Commit a2e0942a authored by Ilya Matyukhin's avatar Ilya Matyukhin Committed by Android (Google) Code Review
Browse files

Merge "Remove IFace#reset" into sc-dev

parents 6d52732d a44f5e99

biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/IFace.aidl

+0 −1
Original line number Original line Diff line number Diff line
@@ -36,5 +36,4 @@ package android.hardware.biometrics.face; 
interface IFace {

interface IFace {

  android.hardware.biometrics.face.SensorProps[] getSensorProps();

  android.hardware.biometrics.face.SensorProps[] getSensorProps();

  android.hardware.biometrics.face.ISession createSession(in int sensorId, in int userId, in android.hardware.biometrics.face.ISessionCallback cb);

  android.hardware.biometrics.face.ISession createSession(in int sensorId, in int userId, in android.hardware.biometrics.face.ISessionCallback cb);

  void reset();

}
 
}

biometrics/face/aidl/android/hardware/biometrics/face/IFace.aidl

+0 −10
Original line number Original line Diff line number Diff line
@@ -50,14 +50,4 @@ interface IFace { 
     * @return A new session.

     * @return A new session.

     */

     */

    ISession createSession(in int sensorId, in int userId, in ISessionCallback cb);

    ISession createSession(in int sensorId, in int userId, in ISessionCallback cb);



    /**

     * Resets the HAL into a clean state, forcing it to cancel all of the pending operations, close

     * its current session, and release all of the acquired resources.

     *

     * This should be used as a last resort to recover the HAL if the current session becomes

     * unresponsive. The implementation might choose to restart the HAL process to get back into a

     * good state.

     */

    void reset();

}
 
}

biometrics/face/aidl/default/Face.cpp

+0 −4
Original line number Original line Diff line number Diff line
@@ -63,8 +63,4 @@ ndk::ScopedAStatus Face::createSession(int32_t /*sensorId*/, int32_t /*userId*/, 
    return ndk::ScopedAStatus::ok();

    return ndk::ScopedAStatus::ok();

}

}





ndk::ScopedAStatus Face::reset() {

    return ndk::ScopedAStatus::ok();

}



}  // namespace aidl::android::hardware::biometrics::face
 
}  // namespace aidl::android::hardware::biometrics::face

biometrics/face/aidl/default/Face.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -27,8 +27,6 @@ class Face : public BnFace { 
    ndk::ScopedAStatus createSession(int32_t sensorId, int32_t userId,

    ndk::ScopedAStatus createSession(int32_t sensorId, int32_t userId,

                                     const std::shared_ptr<ISessionCallback>& cb,

                                     const std::shared_ptr<ISessionCallback>& cb,

                                     std::shared_ptr<ISession>* _aidl_return) override;

                                     std::shared_ptr<ISession>* _aidl_return) override;



    ndk::ScopedAStatus reset() override;

};

};





}  // namespace aidl::android::hardware::biometrics::face
 
}  // namespace aidl::android::hardware::biometrics::face