radio hal: kill service if registration problem
This code isn't compiled with 'assert' enabled, and so we see this
compiler error:
[ 42% 27876/65807] target C++: libril-cuttlefish-fork <= device/google/cuttlefish/guest/hals/ril/libril/ril_service.cpp
device/google/cuttlefish/guest/hals/ril/libril/ril_service.cpp:9931:27: warning: unused variable 'status' [-Wunused-variable]
android::status_t status = radioService[i]->registerAsService(serviceNames[i]);
Probably, all usages of 'assert' should be changed, but for now fixing
this instance to silence compiler warnings. Turning on 'assert' here
could also work, but I've never really seen it used in Android.
Bug: N/A
Test: boot
Change-Id: Id307630538a5c637ccfbb92f4adf83bd0e27ad92
diff --git a/guest/hals/ril/libril/ril_service.cpp b/guest/hals/ril/libril/ril_service.cpp
index 9a2b042..0786c0a 100755
--- a/guest/hals/ril/libril/ril_service.cpp
+++ b/guest/hals/ril/libril/ril_service.cpp
@@ -9929,7 +9929,7 @@
RLOGD("registerService: starting android::hardware::radio::V1_5::IRadio %s for slot %d",
serviceNames[i], i);
android::status_t status = radioService[i]->registerAsService(serviceNames[i]);
- assert(status == android::OK);
+ LOG_ALWAYS_FATAL_IF(status != android::OK, "status %d", status);
RLOGD("registerService: OemHook is enabled = %s", kOemHookEnabled ? "true" : "false");
if (kOemHookEnabled) {