[DO NOT MERGE] lynx/vibrator: Fix Capodetector on AoC restart am: ad95139b97

Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/20750693

Change-Id: Id97c270c40b044ffd2805b8e57aa9f31e41eb319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Paulo
2022-12-29 04:06:00 +00:00
committed by Automerger Merge Worker

View File

@@ -30,10 +30,6 @@ namespace chre {
namespace { // anonymous namespace for file-local definitions
static capo::ConfigureDetector_ConfigData config_data = capo::ConfigureDetector_ConfigData();
static capo::ConfigureDetector msg = capo::ConfigureDetector();
/**
* Called when onConnected() to send NanoappList request.
*/
@@ -166,19 +162,22 @@ void CapoDetector::enable() {
// Create CHRE message with serialized message
flatbuffers::FlatBufferBuilder builder, config_builder, force_builder;
config_data.set_still_time_threshold_nanosecond(mCapoDetectorMDParameters.still_time_threshold_ns);
config_data.set_window_width_nanosecond(mCapoDetectorMDParameters.window_width_ns);
config_data.set_motion_confidence_threshold(mCapoDetectorMDParameters.motion_confidence_threshold);
config_data.set_still_confidence_threshold(mCapoDetectorMDParameters.still_confidence_threshold);
config_data.set_var_threshold(mCapoDetectorMDParameters.var_threshold);
config_data.set_var_threshold_delta(mCapoDetectorMDParameters.var_threshold_delta);
auto config_data = std::make_unique<capo::ConfigureDetector_ConfigData>();
auto msg = std::make_unique<capo::ConfigureDetector>();
msg.set_allocated_config_data(&config_data);
config_data->set_still_time_threshold_nanosecond(mCapoDetectorMDParameters.still_time_threshold_ns);
config_data->set_window_width_nanosecond(mCapoDetectorMDParameters.window_width_ns);
config_data->set_motion_confidence_threshold(mCapoDetectorMDParameters.motion_confidence_threshold);
config_data->set_still_confidence_threshold(mCapoDetectorMDParameters.still_confidence_threshold);
config_data->set_var_threshold(mCapoDetectorMDParameters.var_threshold);
config_data->set_var_threshold_delta(mCapoDetectorMDParameters.var_threshold_delta);
auto pb_size = msg.ByteSizeLong();
msg->set_allocated_config_data(config_data.release());
auto pb_size = msg->ByteSizeLong();
auto pb_data = std::make_unique<uint8_t[]>(pb_size);
if (!msg.SerializeToArray(pb_data.get(), pb_size)) {
if (!msg->SerializeToArray(pb_data.get(), pb_size)) {
ALOGE("Failed to serialize message.");
}