From ffb03995e6a767016671d149762373c217331a32 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Tue, 14 Dec 2021 01:45:47 +0000 Subject: [PATCH] CHECK -> CHECK_EQ copy pasta Hey did I start this? We can take a little bit better errors. :) Bug: N/A Test: N/A Change-Id: I0e96f7f49dae9968904333da9b8269694058c11c --- authsecret/aidl/default/service.cpp | 2 +- automotive/audiocontrol/aidl/default/main.cpp | 2 +- biometrics/face/aidl/default/main.cpp | 2 +- biometrics/fingerprint/aidl/default/main.cpp | 2 +- dumpstate/aidl/default/main.cpp | 2 +- gnss/aidl/default/service.cpp | 2 +- identity/aidl/default/service.cpp | 2 +- light/aidl/default/main.cpp | 2 +- memtrack/aidl/default/main.cpp | 2 +- oemlock/aidl/default/service.cpp | 2 +- power/aidl/default/main.cpp | 2 +- power/stats/aidl/default/main.cpp | 2 +- rebootescrow/aidl/default/service.cpp | 2 +- security/keymint/aidl/default/service.cpp | 2 +- vibrator/aidl/default/main.cpp | 4 ++-- weaver/aidl/default/service.cpp | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/authsecret/aidl/default/service.cpp b/authsecret/aidl/default/service.cpp index efecf10f55..a7d8678d54 100644 --- a/authsecret/aidl/default/service.cpp +++ b/authsecret/aidl/default/service.cpp @@ -28,7 +28,7 @@ int main() { const std::string instance = std::string() + AuthSecret::descriptor + "/default"; binder_status_t status = AServiceManager_addService(authsecret->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); ABinderProcess_joinThreadPool(); return -1; // Should never be reached diff --git a/automotive/audiocontrol/aidl/default/main.cpp b/automotive/audiocontrol/aidl/default/main.cpp index 9b259fca0a..cc15ccb75d 100644 --- a/automotive/audiocontrol/aidl/default/main.cpp +++ b/automotive/audiocontrol/aidl/default/main.cpp @@ -31,7 +31,7 @@ int main() { const std::string instance = std::string() + AudioControl::descriptor + "/default"; binder_status_t status = AServiceManager_addService(audioControl->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); std::shared_ptr powerPolicyClient = ::ndk::SharedRefBase::make(audioControl); diff --git a/biometrics/face/aidl/default/main.cpp b/biometrics/face/aidl/default/main.cpp index 80b153ea1f..b7274e386a 100644 --- a/biometrics/face/aidl/default/main.cpp +++ b/biometrics/face/aidl/default/main.cpp @@ -29,7 +29,7 @@ int main() { const std::string instance = std::string(Face::descriptor) + "/default"; binder_status_t status = AServiceManager_addService(hal->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); ABinderProcess_joinThreadPool(); return EXIT_FAILURE; // should not reach diff --git a/biometrics/fingerprint/aidl/default/main.cpp b/biometrics/fingerprint/aidl/default/main.cpp index 4690d73d80..c985201d63 100644 --- a/biometrics/fingerprint/aidl/default/main.cpp +++ b/biometrics/fingerprint/aidl/default/main.cpp @@ -29,7 +29,7 @@ int main() { const std::string instance = std::string(Fingerprint::descriptor) + "/default"; binder_status_t status = AServiceManager_addService(hal->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); ABinderProcess_joinThreadPool(); return EXIT_FAILURE; // should not reach diff --git a/dumpstate/aidl/default/main.cpp b/dumpstate/aidl/default/main.cpp index 245175291c..5bc85b4474 100644 --- a/dumpstate/aidl/default/main.cpp +++ b/dumpstate/aidl/default/main.cpp @@ -29,7 +29,7 @@ int main() { const std::string instance = std::string() + Dumpstate::descriptor + "/default"; binder_status_t status = AServiceManager_registerLazyService(dumpstate->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); ABinderProcess_joinThreadPool(); return EXIT_FAILURE; // Unreachable diff --git a/gnss/aidl/default/service.cpp b/gnss/aidl/default/service.cpp index 09f1ad2b36..bbe34f1a28 100644 --- a/gnss/aidl/default/service.cpp +++ b/gnss/aidl/default/service.cpp @@ -42,7 +42,7 @@ int main() { const std::string instance = std::string() + Gnss::descriptor + "/default"; binder_status_t status = AServiceManager_addService(gnssAidl->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); sp gnss = new GnssHidlHal(gnssAidl); configureRpcThreadpool(1, true /* will join */); diff --git a/identity/aidl/default/service.cpp b/identity/aidl/default/service.cpp index c290c0827e..78f4fbc4b6 100644 --- a/identity/aidl/default/service.cpp +++ b/identity/aidl/default/service.cpp @@ -43,7 +43,7 @@ int main(int /*argc*/, char* argv[]) { const std::string instance = std::string() + IdentityCredentialStore::descriptor + "/default"; binder_status_t status = AServiceManager_addService(store->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); ABinderProcess_joinThreadPool(); return EXIT_FAILURE; // should not reach diff --git a/light/aidl/default/main.cpp b/light/aidl/default/main.cpp index a860bf4a98..54e1316e2e 100644 --- a/light/aidl/default/main.cpp +++ b/light/aidl/default/main.cpp @@ -28,7 +28,7 @@ int main() { const std::string instance = std::string() + Lights::descriptor + "/default"; binder_status_t status = AServiceManager_addService(lights->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); ABinderProcess_joinThreadPool(); return EXIT_FAILURE; // should not reached diff --git a/memtrack/aidl/default/main.cpp b/memtrack/aidl/default/main.cpp index d063d2aeda..5cf5f94c88 100644 --- a/memtrack/aidl/default/main.cpp +++ b/memtrack/aidl/default/main.cpp @@ -29,7 +29,7 @@ int main() { const std::string instance = std::string() + Memtrack::descriptor + "/default"; binder_status_t status = AServiceManager_addService(memtrack->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); ABinderProcess_joinThreadPool(); return EXIT_FAILURE; // Unreachable diff --git a/oemlock/aidl/default/service.cpp b/oemlock/aidl/default/service.cpp index af828a0d1d..9fa7d63036 100644 --- a/oemlock/aidl/default/service.cpp +++ b/oemlock/aidl/default/service.cpp @@ -28,7 +28,7 @@ int main() { const std::string instance = std::string() + OemLock::descriptor + "/default"; binder_status_t status = AServiceManager_addService(oemlock->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); ABinderProcess_joinThreadPool(); return -1; // Should never be reached diff --git a/power/aidl/default/main.cpp b/power/aidl/default/main.cpp index 964bd96506..306b91b04f 100644 --- a/power/aidl/default/main.cpp +++ b/power/aidl/default/main.cpp @@ -28,7 +28,7 @@ int main() { const std::string instance = std::string() + Power::descriptor + "/default"; binder_status_t status = AServiceManager_addService(vib->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); ABinderProcess_joinThreadPool(); return EXIT_FAILURE; // should not reach diff --git a/power/stats/aidl/default/main.cpp b/power/stats/aidl/default/main.cpp index 2fe3d2e103..9e78247562 100644 --- a/power/stats/aidl/default/main.cpp +++ b/power/stats/aidl/default/main.cpp @@ -73,7 +73,7 @@ int main() { const std::string instance = std::string() + PowerStats::descriptor + "/default"; binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); ABinderProcess_joinThreadPool(); return EXIT_FAILURE; // should not reach diff --git a/rebootescrow/aidl/default/service.cpp b/rebootescrow/aidl/default/service.cpp index 8a8086b498..dc06c71b94 100644 --- a/rebootescrow/aidl/default/service.cpp +++ b/rebootescrow/aidl/default/service.cpp @@ -34,7 +34,7 @@ int main() { auto re = ndk::SharedRefBase::make(rebootEscrowDevicePath); const std::string instance = std::string() + RebootEscrow::descriptor + "/default"; binder_status_t status = AServiceManager_addService(re->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); ABinderProcess_joinThreadPool(); return EXIT_FAILURE; diff --git a/security/keymint/aidl/default/service.cpp b/security/keymint/aidl/default/service.cpp index 8092e348ad..dc0c618916 100644 --- a/security/keymint/aidl/default/service.cpp +++ b/security/keymint/aidl/default/service.cpp @@ -39,7 +39,7 @@ std::shared_ptr addService(Args&&... args) { LOG(INFO) << "adding keymint service instance: " << instanceName; binder_status_t status = AServiceManager_addService(ser->asBinder().get(), instanceName.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); return ser; } diff --git a/vibrator/aidl/default/main.cpp b/vibrator/aidl/default/main.cpp index bd834d2a21..feba2c7062 100644 --- a/vibrator/aidl/default/main.cpp +++ b/vibrator/aidl/default/main.cpp @@ -31,14 +31,14 @@ int main() { auto vib = ndk::SharedRefBase::make(); const std::string vibName = std::string() + Vibrator::descriptor + "/default"; binder_status_t status = AServiceManager_addService(vib->asBinder().get(), vibName.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); // make the vibrator manager service with a different vibrator auto managedVib = ndk::SharedRefBase::make(); auto vibManager = ndk::SharedRefBase::make(std::move(managedVib)); const std::string vibManagerName = std::string() + VibratorManager::descriptor + "/default"; status = AServiceManager_addService(vibManager->asBinder().get(), vibManagerName.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); ABinderProcess_joinThreadPool(); return EXIT_FAILURE; // should not reach diff --git a/weaver/aidl/default/service.cpp b/weaver/aidl/default/service.cpp index 1495bc9201..2099ffd06f 100644 --- a/weaver/aidl/default/service.cpp +++ b/weaver/aidl/default/service.cpp @@ -28,7 +28,7 @@ int main() { const std::string instance = std::string() + Weaver::descriptor + "/default"; binder_status_t status = AServiceManager_addService(weaver->asBinder().get(), instance.c_str()); - CHECK(status == STATUS_OK); + CHECK_EQ(status, STATUS_OK); ABinderProcess_joinThreadPool(); return -1; // Should never be reached