android/device_phh_treble
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build on arm32 target

Browse Source
This commit is contained in:
Pierre-Hugues Husson 2020-03-14 13:32:49 +01:00
parent 00016d4320
commit 47ad176aa5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hal/oppo-fp/BiometricsFingerprint.cpp
View File

@ -52,7 +52,7 @@ public:
OppoClientCallback(sp<android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback> clientCallback) : mClientCallback(clientCallback) {} OppoClientCallback(sp<android::hardware::biometrics::fingerprint::V2_1::IBiometricsFingerprintClientCallback> clientCallback) : mClientCallback(clientCallback) {}
Return<void> onEnrollResult(uint64_t deviceId, uint32_t fingerId, Return<void> onEnrollResult(uint64_t deviceId, uint32_t fingerId,
uint32_t groupId, uint32_t remaining) { uint32_t groupId, uint32_t remaining) {
ALOGE("onEnrollResult %lu %u %u %u", deviceId, fingerId, groupId, remaining); ALOGE("onEnrollResult %" PRIu64 " %u %u %u", deviceId, fingerId, groupId, remaining);
if(mClientCallback != nullptr) if(mClientCallback != nullptr)
mClientCallback->onEnrollResult(deviceId, fingerId, groupId, remaining); mClientCallback->onEnrollResult(deviceId, fingerId, groupId, remaining);
return Void(); return Void();
@ -60,7 +60,7 @@ public:
Return<void> onAcquired(uint64_t deviceId, vendor::oppo::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo acquiredInfo, Return<void> onAcquired(uint64_t deviceId, vendor::oppo::hardware::biometrics::fingerprint::V2_1::FingerprintAcquiredInfo acquiredInfo,
int32_t vendorCode) { int32_t vendorCode) {
ALOGE("onAcquired %lu %d", deviceId, vendorCode); ALOGE("onAcquired %" PRIu64 " %d", deviceId, vendorCode);
if(mClientCallback != nullptr) if(mClientCallback != nullptr)
mClientCallback->onAcquired(deviceId, OppoToAOSPFingerprintAcquiredInfo(acquiredInfo), vendorCode); mClientCallback->onAcquired(deviceId, OppoToAOSPFingerprintAcquiredInfo(acquiredInfo), vendorCode);
return Void(); return Void();
@ -68,14 +68,14 @@ public:
Return<void> onAuthenticated(uint64_t deviceId, uint32_t fingerId, uint32_t groupId, Return<void> onAuthenticated(uint64_t deviceId, uint32_t fingerId, uint32_t groupId,
const hidl_vec<uint8_t>& token) { const hidl_vec<uint8_t>& token) {
ALOGE("onAuthenticated %lu %u %u", deviceId, fingerId, groupId); ALOGE("onAuthenticated %" PRIu64 " %u %u", deviceId, fingerId, groupId);
if(mClientCallback != nullptr) if(mClientCallback != nullptr)
mClientCallback->onAuthenticated(deviceId, fingerId, groupId, token); mClientCallback->onAuthenticated(deviceId, fingerId, groupId, token);
return Void(); return Void();
} }
Return<void> onError(uint64_t deviceId, vendor::oppo::hardware::biometrics::fingerprint::V2_1::FingerprintError error, int32_t vendorCode) { Return<void> onError(uint64_t deviceId, vendor::oppo::hardware::biometrics::fingerprint::V2_1::FingerprintError error, int32_t vendorCode) {
ALOGE("onError %lu %d", deviceId, vendorCode); ALOGE("onError %" PRIu64 " %d", deviceId, vendorCode);
if(error == vendor::oppo::hardware::biometrics::fingerprint::V2_1::FingerprintError::ERROR_CANCELED) { if(error == vendor::oppo::hardware::biometrics::fingerprint::V2_1::FingerprintError::ERROR_CANCELED) {
receivedCancel = true; receivedCancel = true;
} }
@ -86,7 +86,7 @@ public:
Return<void> onRemoved(uint64_t deviceId, uint32_t fingerId, uint32_t groupId, Return<void> onRemoved(uint64_t deviceId, uint32_t fingerId, uint32_t groupId,
uint32_t remaining) { uint32_t remaining) {
ALOGE("onRemoved %lu %u", deviceId, fingerId); ALOGE("onRemoved %" PRIu64 " %" PRIu32, deviceId, fingerId);
if(mClientCallback != nullptr) if(mClientCallback != nullptr)
mClientCallback->onRemoved(deviceId, fingerId, groupId, remaining); mClientCallback->onRemoved(deviceId, fingerId, groupId, remaining);
return Void(); return Void();
@ -95,7 +95,7 @@ public:
Return<void> onEnumerate(uint64_t deviceId, uint32_t fingerId, uint32_t groupId, Return<void> onEnumerate(uint64_t deviceId, uint32_t fingerId, uint32_t groupId,
uint32_t remaining) { uint32_t remaining) {
receivedEnumerate = true; receivedEnumerate = true;
ALOGE("onEnumerate %lu %u %u %u", deviceId, fingerId, groupId, remaining); ALOGE("onEnumerate %" PRIu64 " %u %u %u", deviceId, fingerId, groupId, remaining);
if(mClientCallback != nullptr) if(mClientCallback != nullptr)
mClientCallback->onEnumerate(deviceId, fingerId, groupId, remaining); mClientCallback->onEnumerate(deviceId, fingerId, groupId, remaining);
return Void(); return Void();
@ -104,7 +104,7 @@ public:
Return<void> onTouchUp(uint64_t deviceId) { return Void(); } Return<void> onTouchUp(uint64_t deviceId) { return Void(); }
Return<void> onTouchDown(uint64_t deviceId) { return Void(); } Return<void> onTouchDown(uint64_t deviceId) { return Void(); }
Return<void> onSyncTemplates(uint64_t deviceId, const hidl_vec<uint32_t>& fingerId, uint32_t remaining) { Return<void> onSyncTemplates(uint64_t deviceId, const hidl_vec<uint32_t>& fingerId, uint32_t remaining) {
ALOGE("onSyncTemplates %lu %zu %u", deviceId, fingerId.size(), remaining); ALOGE("onSyncTemplates %" PRIu64 " %zu %" PRIu32, deviceId, fingerId.size(), remaining);
myDeviceId = deviceId; myDeviceId = deviceId;
for(auto fid : fingerId) { for(auto fid : fingerId) {