am 286c139b: am 93bf9964: Fix sensor multi hal crash when sub-HAL reports an error
* commit '286c139bcce4107c24a3fd2122c042c98a223f49':
Fix sensor multi hal crash when sub-HAL reports an error
diff --git a/modules/sensors/multihal.cpp b/modules/sensors/multihal.cpp
index a145c37..36345f9 100644
--- a/modules/sensors/multihal.cpp
+++ b/modules/sensors/multihal.cpp
@@ -214,9 +214,11 @@
}
int sensors_poll_context_t::activate(int handle, int enabled) {
+ int retval = -EINVAL;
ALOGV("activate");
sensors_poll_device_t* v0 = this->get_v0_device_by_handle(handle);
- int retval = v0->activate(v0, get_local_handle(handle), enabled);
+ if (v0)
+ retval = v0->activate(v0, get_local_handle(handle), enabled);
ALOGV("retval %d", retval);
return retval;
}
@@ -576,7 +578,8 @@
sensors_module_t *sensors_module = (sensors_module_t*) *it;
struct hw_device_t* sub_hw_device;
int sub_open_result = sensors_module->common.methods->open(*it, name, &sub_hw_device);
- dev->addSubHwDevice(sub_hw_device);
+ if (!sub_open_result)
+ dev->addSubHwDevice(sub_hw_device);
}
// Prepare the output param and return