commit 9ca2071fdf72419e94720e6ec377529a87404d2c
author Kelly Rossmoyer <krossmo@google.com> Fri Jul 31 06:28:16 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 31 06:28:16 2020 +0000
tree e4f796af2471b45db3b3b1a58cb093c6bba05159
parent 994ffd660b9f5f344f26e28c6dba316fe1c4b4c2
parent 3145aa352d0ea369031d9be6795674f72fc63930

Update language to comply with Android's inclusive language guidance am: 8baad7126a am: 8a6f081643 am: dc2838f0d6 am: 3145aa352d

Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1378877

Change-Id: I7c9de69c2f97bc38a58d0ab2316264b22863d0a3

cvq_util.c

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 @@
         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,

tests/oslo_package_test.c

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 @@
             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 @@
             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);

tests/oslo_sound_model_control.cpp

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 @@
   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();