summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKelly Rossmoyer <krossmo@google.com>2020-07-31 06:11:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-31 06:11:20 +0000
commit3145aa352d0ea369031d9be6795674f72fc63930 (patch)
treee4f796af2471b45db3b3b1a58cb093c6bba05159
parentb23f30d364dc1e5ddb59dfb46f153ecced42d2be (diff)
parentdc2838f0d64c473ee434e78b61afc8c99ed16769 (diff)
downloadsound_trigger_hal-3145aa352d0ea369031d9be6795674f72fc63930.tar.gz
Update language to comply with Android's inclusive language guidance am: 8baad7126a am: 8a6f081643 am: dc2838f0d6
Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1378877 Change-Id: I36183ee446c7c555dfdab5b880bac5d66e723dde
-rw-r--r--cvq_util.c2
-rw-r--r--tests/oslo_package_test.c4
-rw-r--r--tests/oslo_sound_model_control.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/cvq_util.c b/cvq_util.c
index bd285eb..62c9514 100644
--- a/cvq_util.c
+++ b/cvq_util.c
@@ -1224,7 +1224,7 @@ int setup_sensor_package(struct iaxxx_odsp_hw *odsp_hdl)
return err;
}
- // Create Dummy sensor plugin
+ // Create placeholder sensor plugin
err = iaxxx_odsp_plugin_create(odsp_hdl, SENSOR_INSTANCE_ID,
SENSOR_PRIORITY, SENSOR_PKG_ID,
SENSOR_PLUGIN_IDX, IAXXX_HMD_BLOCK_ID,
diff --git a/tests/oslo_package_test.c b/tests/oslo_package_test.c
index 3b47bba..dccc47f 100644
--- a/tests/oslo_package_test.c
+++ b/tests/oslo_package_test.c
@@ -205,7 +205,7 @@ int main(int argc, char *argv[])
goto exit;
}
- /* Create Dummy sensor plugin */
+ /* Create placeholder sensor plugin */
pi.plg_idx = 0;
pi.pkg_id = sensor_pkg_id;
pi.block_id = 1;
@@ -345,7 +345,7 @@ int main(int argc, char *argv[])
goto exit;
}
- /* destroy Dummy sensor plugin */
+ /* destroy placeholder sensor plugin */
pi.block_id = 1;
pi.inst_id = 3;
err = ioctl(fileno(odsp_node), ODSP_PLG_DESTROY, (unsigned long)&pi);
diff --git a/tests/oslo_sound_model_control.cpp b/tests/oslo_sound_model_control.cpp
index 671cd6f..38a2f8a 100644
--- a/tests/oslo_sound_model_control.cpp
+++ b/tests/oslo_sound_model_control.cpp
@@ -88,7 +88,7 @@ static bool osloLoadSoundModel(SoundModelHandle *hndl) {
soundModel.vendorUuid.variantAndClockSeqHigh = uuid.clockSeq;
memcpy(&soundModel.vendorUuid.node[0], &uuid.node[0], sizeof(uuid.node));
- soundModel.data.resize(1); // Insert a dummy byte to bypass HAL NULL checks.
+ soundModel.data.resize(1); // Insert an unused byte to bypass HAL NULL checks.
bool loaded = false;
sp<ISoundTriggerHw> stHal = ISoundTriggerHw::getService();