Return<*> getStatus().isOk() -> isOk()
Bug: 31348667
Test: compiles
Change-Id: I44d89e45c8bf8bcd7a47dff1f5cd4d454c95a079
diff --git a/fingerprintd/FingerprintDaemonProxy.cpp b/fingerprintd/FingerprintDaemonProxy.cpp
index 0119e55..73748f2 100644
--- a/fingerprintd/FingerprintDaemonProxy.cpp
+++ b/fingerprintd/FingerprintDaemonProxy.cpp
@@ -171,7 +171,7 @@
hardware::hidl_array<uint8_t, hw_auth_token_size> hat(token);
Return<RequestStatus> ret = gBFP->enroll(hat, groupId, timeout);
- if (!ret.getStatus().isOk()) {
+ if (!ret.isOk()) {
ALOGE("Unknown transport error");
return -1;
}
@@ -186,7 +186,7 @@
int32_t FingerprintDaemonProxy::postEnroll() {
Return<RequestStatus> ret = gBFP->postEnroll();
- if (!ret.getStatus().isOk()) {
+ if (!ret.isOk()) {
ALOGE("Unknown transport error");
return -1;
}
@@ -198,7 +198,7 @@
int32_t FingerprintDaemonProxy::stopEnrollment() {
ALOG(LOG_VERBOSE, LOG_TAG, "stopEnrollment()\n");
Return<RequestStatus> ret = gBFP->cancel();
- if (!ret.getStatus().isOk()) {
+ if (!ret.isOk()) {
ALOGE("Unknown transport error");
return -1;
}
@@ -210,7 +210,7 @@
int32_t FingerprintDaemonProxy::authenticate(uint64_t sessionId, uint32_t groupId) {
ALOG(LOG_VERBOSE, LOG_TAG, "authenticate(sid=%" PRId64 ", gid=%d)\n", sessionId, groupId);
Return<RequestStatus> ret = gBFP->authenticate(sessionId, groupId);
- if (!ret.getStatus().isOk()) {
+ if (!ret.isOk()) {
ALOGE("Unknown transport error");
return -1;
}
@@ -222,7 +222,7 @@
int32_t FingerprintDaemonProxy::stopAuthentication() {
ALOG(LOG_VERBOSE, LOG_TAG, "stopAuthentication()\n");
Return<RequestStatus> ret = gBFP->cancel();
- if (!ret.getStatus().isOk()) {
+ if (!ret.isOk()) {
ALOGE("Unknown transport error");
return -1;
}
@@ -234,7 +234,7 @@
int32_t FingerprintDaemonProxy::remove(int32_t fingerId, int32_t groupId) {
ALOG(LOG_VERBOSE, LOG_TAG, "remove(fid=%d, gid=%d)\n", fingerId, groupId);
Return<RequestStatus> ret = gBFP->remove(groupId, fingerId);
- if (!ret.getStatus().isOk()) {
+ if (!ret.isOk()) {
ALOGE("Unknown transport error");
return -1;
}
@@ -246,7 +246,7 @@
int32_t FingerprintDaemonProxy::enumerate() {
ALOG(LOG_VERBOSE, LOG_TAG, "enumerate()\n");
Return<RequestStatus> ret = gBFP->enumerate();
- if (!ret.getStatus().isOk()) {
+ if (!ret.isOk()) {
ALOGE("Unknown transport error");
return -1;
}
@@ -269,7 +269,7 @@
pathname.setToExternal(reinterpret_cast<const char*>(path), pathlen);
ALOG(LOG_VERBOSE, LOG_TAG, "setActiveGroup(%d, %s, %zu)", groupId, pathname.c_str(), pathlen);
Return<RequestStatus> ret = gBFP->setActiveGroup(groupId, pathname);
- if (!ret.getStatus().isOk()) {
+ if (!ret.isOk()) {
ALOGE("Unknown transport error");
return -1;
}
diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index d2c119d..a10167f 100644
--- a/gatekeeperd/gatekeeperd.cpp
+++ b/gatekeeperd/gatekeeperd.cpp
@@ -184,7 +184,7 @@
ret = rsp.timeout;
}
});
- if (!hwRes.getStatus().isOk()) {
+ if (!hwRes.isOk()) {
ALOGE("enroll transaction failed\n");
ret = -1;
}
@@ -267,7 +267,7 @@
ret = rsp.timeout;
}
});
- if (!hwRes.getStatus().isOk()) {
+ if (!hwRes.isOk()) {
ALOGE("verify transaction failed\n");
ret = -1;
}