Change return values of type status_t from NO_ERROR to OK
in bufferhub related directories
Bug: 118696702
Fixes: 118696702
Test: all tests pass.
AHardwareBufferTest BufferHubBuffer_test BufferHubMetadata_test
buffer_hub_binder_service-test buffer_hub_queue_producer-test
libgui_test libsensor_test vrflinger_test buffer_hub-test
buffer_hub_queue-test dvr_buffer_queue-test dvr_api-test
dvr_display-test
Change-Id: Iee198ddbec035856185fcab34b0d631bd3726b77
diff --git a/services/vr/bufferhubd/IBufferHub.cpp b/services/vr/bufferhubd/IBufferHub.cpp
index 022a9cc..5980873 100644
--- a/services/vr/bufferhubd/IBufferHub.cpp
+++ b/services/vr/bufferhubd/IBufferHub.cpp
@@ -30,7 +30,7 @@
uint32_t format, uint64_t usage,
uint64_t user_metadata_size) {
Parcel data, reply;
- status_t ret = NO_ERROR;
+ status_t ret = OK;
ret |= data.writeInterfaceToken(IBufferHub::getInterfaceDescriptor());
ret |= data.writeUint32(width);
ret |= data.writeUint32(height);
@@ -39,13 +39,13 @@
ret |= data.writeUint64(usage);
ret |= data.writeUint64(user_metadata_size);
- if (ret != NO_ERROR) {
+ if (ret != OK) {
ALOGE("BpBufferHub::createBuffer: failed to write into parcel");
return nullptr;
}
ret = remote()->transact(CREATE_BUFFER, data, &reply);
- if (ret == NO_ERROR) {
+ if (ret == OK) {
return interface_cast<IBufferClient>(reply.readStrongBinder());
} else {
ALOGE("BpBufferHub::createBuffer: failed to transact; errno=%d", ret);
@@ -56,18 +56,18 @@
status_t BpBufferHub::importBuffer(uint64_t token,
sp<IBufferClient>* outClient) {
Parcel data, reply;
- status_t ret = NO_ERROR;
+ status_t ret = OK;
ret |= data.writeInterfaceToken(IBufferHub::getInterfaceDescriptor());
ret |= data.writeUint64(token);
- if (ret != NO_ERROR) {
+ if (ret != OK) {
ALOGE("BpBufferHub::importBuffer: failed to write into parcel");
return ret;
}
ret = remote()->transact(IMPORT_BUFFER, data, &reply);
- if (ret == NO_ERROR) {
+ if (ret == OK) {
*outClient = interface_cast<IBufferClient>(reply.readStrongBinder());
- return NO_ERROR;
+ return OK;
} else {
ALOGE("BpBufferHub::importBuffer: failed to transact; errno=%d", ret);
return ret;
@@ -94,7 +94,7 @@
uint64_t token = data.readUint64();
sp<IBufferClient> client;
status_t ret = importBuffer(token, &client);
- if (ret == NO_ERROR) {
+ if (ret == OK) {
return reply->writeStrongBinder(IInterface::asBinder(client));
} else {
return ret;
diff --git a/services/vr/bufferhubd/buffer_hub_binder.cpp b/services/vr/bufferhubd/buffer_hub_binder.cpp
index afd34aa..580433e 100644
--- a/services/vr/bufferhubd/buffer_hub_binder.cpp
+++ b/services/vr/bufferhubd/buffer_hub_binder.cpp
@@ -25,7 +25,7 @@
String16(getServiceName()), service,
/*allowIsolated =*/false,
/*dump flags =*/IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT);
- if (result != NO_ERROR) {
+ if (result != OK) {
ALOGE("Publishing bufferhubd failed with error %d", result);
return result;
}
@@ -62,7 +62,7 @@
}
fclose(out);
- return NO_ERROR;
+ return OK;
}
status_t BufferHubBinderService::registerToken(
@@ -72,7 +72,7 @@
} while (token_map_.find(*outToken) != token_map_.end());
token_map_.emplace(*outToken, node);
- return NO_ERROR;
+ return OK;
}
sp<IBufferClient> BufferHubBinderService::createBuffer(
@@ -122,7 +122,7 @@
token_map_.erase(iter);
client_list_.push_back(client);
- return NO_ERROR;
+ return OK;
}
} // namespace dvr
diff --git a/services/vr/bufferhubd/bufferhubd.cpp b/services/vr/bufferhubd/bufferhubd.cpp
index 3e10b26..e44cc2a 100644
--- a/services/vr/bufferhubd/bufferhubd.cpp
+++ b/services/vr/bufferhubd/bufferhubd.cpp
@@ -41,7 +41,7 @@
dispatcher->AddService(pdx_service);
ret = android::dvr::BufferHubBinderService::start(pdx_service);
- CHECK_ERROR(ret != android::NO_ERROR, error,
+ CHECK_ERROR(ret != android::OK, error,
"Failed to create bufferhub binder service\n");
ret = dvrSetSchedulerClass(0, "graphics");
diff --git a/services/vr/bufferhubd/tests/buffer_hub_binder_service-test.cpp b/services/vr/bufferhubd/tests/buffer_hub_binder_service-test.cpp
index 7c00fa6..94b422a 100644
--- a/services/vr/bufferhubd/tests/buffer_hub_binder_service-test.cpp
+++ b/services/vr/bufferhubd/tests/buffer_hub_binder_service-test.cpp
@@ -47,24 +47,24 @@
uint64_t token1 = 0ULL;
status_t ret = bufferClient->duplicate(&token1);
- EXPECT_EQ(ret, NO_ERROR);
+ EXPECT_EQ(ret, OK);
// Tokens should be unique even corresponding to the same buffer
uint64_t token2 = 0ULL;
ret = bufferClient->duplicate(&token2);
- EXPECT_EQ(ret, NO_ERROR);
+ EXPECT_EQ(ret, OK);
EXPECT_NE(token2, token1);
sp<IBufferClient> bufferClient1;
ret = service->importBuffer(token1, &bufferClient1);
- EXPECT_EQ(ret, NO_ERROR);
+ EXPECT_EQ(ret, OK);
ASSERT_THAT(bufferClient1, NotNull());
EXPECT_TRUE(bufferClient1->isValid());
// Consumes the token to keep the service clean
sp<IBufferClient> bufferClient2;
ret = service->importBuffer(token2, &bufferClient2);
- EXPECT_EQ(ret, NO_ERROR);
+ EXPECT_EQ(ret, OK);
ASSERT_THAT(bufferClient2, NotNull());
EXPECT_TRUE(bufferClient2->isValid());
}
diff --git a/services/vr/hardware_composer/impl/vr_hwc.cpp b/services/vr/hardware_composer/impl/vr_hwc.cpp
index 417460c..fb7932d 100644
--- a/services/vr/hardware_composer/impl/vr_hwc.cpp
+++ b/services/vr/hardware_composer/impl/vr_hwc.cpp
@@ -1016,7 +1016,7 @@
std::lock_guard<std::mutex> guard(mutex_);
if (callback_ != nullptr)
callback_->onVsync(kDefaultDisplayId, vsync_timestamp);
- return NO_ERROR;
+ return OK;
}
void VrHwc::VsyncCallback::SetEventCallback(EventCallback* callback) {