When dimlayer_hbm is enabled, HWC ends up disabling all color transformations, including Night Light. Since we enable/disable dimlayer_hbm on authenticate/cancel, this means that whenever the UDFPS circle is present, Night Light ends up temporarily turning off. This is especially not helpful on the lock screen, where the UDFPS circle is active all the time. Instead of turning on dimlayer_hbm during the entire time that the UDFPS circle is showing, let's turn on dimlayer_hbm only when the user is pressing down on the circle. In doing so, the color transformations will be disabled for only when the user is touching the circle. We will still disable dimlayer_hbm on cancel anyway, just in case that wasn't already set to off by the time cancel() is called. However, when enrolling a new fingerprint, the user is going to be tapping on the UDFPS circle many, many times, and the user may prefer to just keep dimlayer on for the entire duration. Add `isEnrolling` to track that, and don't change dimlayer state while that is set to true. Change-Id: I9ed1a6b5839e39b8f70ff4af4ebe8d1bc66ffb98 Signed-off-by: AnierinB <anierin@evolution-x.org>
172 lines
6.3 KiB
C++
172 lines
6.3 KiB
C++
/*
|
|
* Copyright (C) 2022 The LineageOS Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#define LOG_TAG "android.hardware.biometrics.fingerprint@2.3-service.oplus"
|
|
|
|
#include "BiometricsFingerprint.h"
|
|
|
|
namespace android {
|
|
namespace hardware {
|
|
namespace biometrics {
|
|
namespace fingerprint {
|
|
namespace V2_3 {
|
|
namespace implementation {
|
|
|
|
BiometricsFingerprint::BiometricsFingerprint()
|
|
: mOplusDisplayFd(open("/dev/oplus_display", O_RDWR)) {
|
|
mOplusBiometricsFingerprint = IOplusBiometricsFingerprint::getService();
|
|
mOplusBiometricsFingerprint->setHalCallback(this);
|
|
}
|
|
|
|
Return<uint64_t> BiometricsFingerprint::setNotify(
|
|
const sp<V2_1::IBiometricsFingerprintClientCallback>& clientCallback) {
|
|
mClientCallback = std::move(clientCallback);
|
|
return mOplusBiometricsFingerprint->setNotify(this);
|
|
}
|
|
|
|
Return<uint64_t> BiometricsFingerprint::preEnroll() {
|
|
this->isEnrolling = true;
|
|
setDimlayerHbm(1);
|
|
return mOplusBiometricsFingerprint->preEnroll();
|
|
}
|
|
|
|
Return<RequestStatus> BiometricsFingerprint::enroll(const hidl_array<uint8_t, 69>& hat,
|
|
uint32_t gid, uint32_t timeoutSec) {
|
|
return mOplusBiometricsFingerprint->enroll(hat, gid, timeoutSec);
|
|
}
|
|
|
|
Return<RequestStatus> BiometricsFingerprint::postEnroll() {
|
|
this->isEnrolling = false;
|
|
setDimlayerHbm(0);
|
|
return mOplusBiometricsFingerprint->postEnroll();
|
|
}
|
|
|
|
Return<uint64_t> BiometricsFingerprint::getAuthenticatorId() {
|
|
return mOplusBiometricsFingerprint->getAuthenticatorId();
|
|
}
|
|
|
|
Return<RequestStatus> BiometricsFingerprint::cancel() {
|
|
if (!this->isEnrolling) {
|
|
setDimlayerHbm(0);
|
|
}
|
|
return mOplusBiometricsFingerprint->cancel();
|
|
}
|
|
|
|
Return<RequestStatus> BiometricsFingerprint::enumerate() {
|
|
return mOplusBiometricsFingerprint->enumerate();
|
|
}
|
|
|
|
Return<RequestStatus> BiometricsFingerprint::remove(uint32_t gid, uint32_t fid) {
|
|
return mOplusBiometricsFingerprint->remove(gid, fid);
|
|
}
|
|
|
|
Return<RequestStatus> BiometricsFingerprint::setActiveGroup(uint32_t gid,
|
|
const hidl_string& storePath) {
|
|
return mOplusBiometricsFingerprint->setActiveGroup(gid, storePath);
|
|
}
|
|
|
|
Return<RequestStatus> BiometricsFingerprint::authenticate(uint64_t operationId, uint32_t gid) {
|
|
// In case postEnroll never got called for whatever reason, set isEnrolling to false.
|
|
this->isEnrolling = false;
|
|
return mOplusBiometricsFingerprint->authenticate(operationId, gid);
|
|
}
|
|
|
|
Return<bool> BiometricsFingerprint::isUdfps(uint32_t sensorID) {
|
|
return mOplusBiometricsFingerprint->isUdfps(sensorID);
|
|
}
|
|
|
|
Return<void> BiometricsFingerprint::onFingerDown(uint32_t x, uint32_t y, float minor, float major) {
|
|
if (!this->isEnrolling) {
|
|
setDimlayerHbm(1);
|
|
}
|
|
setFpPress(1);
|
|
return mOplusBiometricsFingerprint->onFingerDown(x, y, minor, major);
|
|
}
|
|
|
|
Return<void> BiometricsFingerprint::onFingerUp() {
|
|
setFpPress(0);
|
|
if (!this->isEnrolling) {
|
|
setDimlayerHbm(0);
|
|
}
|
|
return mOplusBiometricsFingerprint->onFingerUp();
|
|
}
|
|
|
|
Return<void> BiometricsFingerprint::onEnrollResult(uint64_t deviceId, uint32_t fingerId,
|
|
uint32_t groupId, uint32_t remaining) {
|
|
return mClientCallback->onEnrollResult(deviceId, fingerId, groupId, remaining);
|
|
}
|
|
|
|
Return<void> BiometricsFingerprint::onAcquired(uint64_t deviceId,
|
|
V2_1::FingerprintAcquiredInfo acquiredInfo,
|
|
int32_t vendorCode) {
|
|
return mClientCallback->onAcquired(deviceId, acquiredInfo, vendorCode);
|
|
}
|
|
|
|
Return<void> BiometricsFingerprint::onAuthenticated(uint64_t deviceId, uint32_t fingerId,
|
|
uint32_t groupId,
|
|
const hidl_vec<uint8_t>& token) {
|
|
if (fingerId != 0) {
|
|
setDimlayerHbm(0);
|
|
}
|
|
setFpPress(0);
|
|
return mClientCallback->onAuthenticated(deviceId, fingerId, groupId, token);
|
|
}
|
|
|
|
Return<void> BiometricsFingerprint::onError(uint64_t deviceId, FingerprintError error,
|
|
int32_t vendorCode) {
|
|
setFpPress(0);
|
|
if (!this->isEnrolling) {
|
|
setDimlayerHbm(0);
|
|
}
|
|
return mClientCallback->onError(deviceId, error, vendorCode);
|
|
}
|
|
|
|
Return<void> BiometricsFingerprint::onRemoved(uint64_t deviceId, uint32_t fingerId,
|
|
uint32_t groupId, uint32_t remaining) {
|
|
return mClientCallback->onRemoved(deviceId, fingerId, groupId, remaining);
|
|
}
|
|
|
|
Return<void> BiometricsFingerprint::onEnumerate(uint64_t deviceId, uint32_t fingerId,
|
|
uint32_t groupId, uint32_t remaining) {
|
|
return mClientCallback->onEnumerate(deviceId, fingerId, groupId, remaining);
|
|
}
|
|
|
|
Return<void> BiometricsFingerprint::onAcquired_2_2(uint64_t deviceId,
|
|
FingerprintAcquiredInfo acquiredInfo,
|
|
int32_t vendorCode) {
|
|
return reinterpret_cast<V2_2::IBiometricsFingerprintClientCallback*>(mClientCallback.get())
|
|
->onAcquired_2_2(deviceId, acquiredInfo, vendorCode);
|
|
}
|
|
|
|
Return<void> BiometricsFingerprint::onEngineeringInfoUpdated(
|
|
uint32_t /*lenth*/, const hidl_vec<uint32_t>& /*keys*/,
|
|
const hidl_vec<hidl_string>& /*values*/) {
|
|
return Void();
|
|
}
|
|
|
|
Return<void> BiometricsFingerprint::onFingerprintCmd(int32_t /*cmdId*/,
|
|
const hidl_vec<uint32_t>& /*result*/,
|
|
uint32_t /*resultLen*/) {
|
|
return Void();
|
|
}
|
|
|
|
} // namespace implementation
|
|
} // namespace V2_3
|
|
} // namespace fingerprint
|
|
} // namespace biometrics
|
|
} // namespace hardware
|
|
} // namespace android
|