Merge "Remove IFingerprint#reset" into sc-dev

This commit is contained in:
Ilya Matyukhin
2021-03-10 22:17:26 +00:00
committed by Android (Google) Code Review
4 changed files with 0 additions and 19 deletions

View File

@@ -36,5 +36,4 @@ package android.hardware.biometrics.fingerprint;
interface IFingerprint {
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);
void reset();
}

View File

@@ -65,14 +65,4 @@ interface IFingerprint {
* @return A new session
*/
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();
}

View File

@@ -63,10 +63,4 @@ ndk::ScopedAStatus Fingerprint::createSession(int32_t sensorId, int32_t userId,
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

View File

@@ -34,8 +34,6 @@ class Fingerprint : public BnFingerprint {
const std::shared_ptr<ISessionCallback>& cb,
std::shared_ptr<ISession>* out) override;
ndk::ScopedAStatus reset() override;
private:
std::unique_ptr<FakeFingerprintEngine> mEngine;
WorkerThread mWorker;