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

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

Merge "Remove IFingerprint#reset" into sc-dev

parents a2e0942a 9de6ef99

biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/IFingerprint.aidl

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

interface IFingerprint {

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

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

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

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

  void reset();

}
 
}

biometrics/fingerprint/aidl/android/hardware/biometrics/fingerprint/IFingerprint.aidl

+0 −10
Original line number Original line Diff line number Diff line
@@ -65,14 +65,4 @@ interface IFingerprint { 
     * @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/fingerprint/aidl/default/Fingerprint.cpp

+0 −6
Original line number Original line Diff line number Diff line
@@ -63,10 +63,4 @@ ndk::ScopedAStatus Fingerprint::createSession(int32_t sensorId, int32_t userId, 
    return ndk::ScopedAStatus::ok();

    return ndk::ScopedAStatus::ok();

}

}





ndk::ScopedAStatus Fingerprint::reset() {

    // Crash. The system will start a fresh instance of the HAL.

    CHECK(false) << "Unable to reset. Crashing.";

    return ndk::ScopedAStatus::ok();

}



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

biometrics/fingerprint/aidl/default/include/Fingerprint.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -34,8 +34,6 @@ class Fingerprint : public BnFingerprint { 
                                     const std::shared_ptr<ISessionCallback>& cb,

                                     const std::shared_ptr<ISessionCallback>& cb,

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

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





    ndk::ScopedAStatus reset() override;



  private:

  private:

    std::unique_ptr<FakeFingerprintEngine> mEngine;

    std::unique_ptr<FakeFingerprintEngine> mEngine;

    WorkerThread mWorker;

    WorkerThread mWorker;