Merge "Refactor: rename chre_cross_validator nanoapp to *_sensor" into rvc-dev am: 63ca435527

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/chre/+/11809432

Change-Id: I6ed84c5c4c300a680b177404de2c0aae1a27055f

9 files changed, 97 insertions, 90 deletions

diff --git a/apps/test/common/chre_cross_validator/Makefile b/apps/test/common/chre_cross_validator_sensor/Makefile
index 19ce5176..9be3acb1 100644
--- a/apps/test/common/chre_cross_validator/Makefile
+++ b/apps/test/common/chre_cross_validator_sensor/Makefile
@@ -15,26 +15,26 @@ endif
 
 # Nanoapp Configuration ########################################################
 
-NANOAPP_NAME = chre_cross_validator
+NANOAPP_NAME = chre_cross_validator_sensor
 NANOAPP_ID = 0x476f6f6754000002
-NANOAPP_NAME_STRING = \"Chre\ Cross\ Validator\"
+NANOAPP_NAME_STRING = \"Chre\ Cross\ Validator\ Sensor\"
 NANOAPP_VERSION = 0x00000001
 
-NANOAPP_PATH = $(CHRE_PREFIX)/apps/test/common/chre_cross_validator
+NANOAPP_PATH = $(CHRE_PREFIX)/apps/test/common/chre_cross_validator_sensor
 
 # Protobuf Sources #############################################################
 
 NANOPB_EXTENSION = nanopb
 
-NANOPB_SRCS += $(NANOAPP_PATH)/../proto/chre_cross_validation.proto
+NANOPB_SRCS += $(NANOAPP_PATH)/../proto/chre_cross_validation_sensor.proto
 NANOPB_PROTO_PATH = $(NANOAPP_PATH)/../proto
 NANOPB_INCLUDES = $(NANOPB_PROTO_PATH)
 NANOPB_FLAGS += --proto_path=$(NANOPB_PROTO_PATH)
 
 # Source Code ##################################################################
 
-COMMON_SRCS += $(NANOAPP_PATH)/src/chre_cross_validator.cc
-COMMON_SRCS += $(NANOAPP_PATH)/src/chre_cross_validator_manager.cc
+COMMON_SRCS += $(NANOAPP_PATH)/src/chre_cross_validator_sensor.cc
+COMMON_SRCS += $(NANOAPP_PATH)/src/chre_cross_validator_sensor_manager.cc
 COMMON_SRCS += $(CHRE_PREFIX)/util/nanoapp/callbacks.cc
 
 # Compiler Flags ###############################################################
diff --git a/apps/test/common/chre_cross_validator/inc/chre_cross_validator_manager.h b/apps/test/common/chre_cross_validator_sensor/inc/chre_cross_validator_sensor_manager.h
index 5fd6d391..6b2229c6 100644
--- a/apps/test/common/chre_cross_validator/inc/chre_cross_validator_manager.h
+++ b/apps/test/common/chre_cross_validator_sensor/inc/chre_cross_validator_sensor_manager.h
@@ -20,14 +20,14 @@
 #include <chre.h>
 #include <pb_encode.h>
 
-#include "chre_cross_validation.nanopb.h"
+#include "chre_cross_validation_sensor.nanopb.h"
 
 #include "chre/util/optional.h"
 #include "chre/util/singleton.h"
 
 namespace chre {
 
-namespace cross_validator {
+namespace cross_validator_sensor {
 
 // TODO(b/154271551): Break up the Manager class into more fine-grained classes
 // to avoid it becoming to complex.
@@ -107,7 +107,7 @@ class Manager {
    *
    * @return The SensorDatapoint proto message.
    */
-  static chre_cross_validation_SensorDatapoint makeDatapoint(
+  static chre_cross_validation_sensor_SensorDatapoint makeDatapoint(
       bool (*encodeFunc)(pb_ostream_t *, const pb_field_t *, void *const *),
       const void *sampleDataFromChre, uint64_t currentTimestamp);
 
@@ -194,7 +194,8 @@ class Manager {
    * @return true if successful.
    */
   bool handleStartSensorMessage(
-      const chre_cross_validation_StartSensorCommand &startSensorCommand);
+      const chre_cross_validation_sensor_StartSensorCommand
+          &startSensorCommand);
 
   /**
    * @param header The sensor data header from CHRE sensor data event.
@@ -226,7 +227,7 @@ class Manager {
    * @return The Data proto message that is ready to be sent to host with three
    * axis data.
    */
-  chre_cross_validation_Data makeSensorThreeAxisData(
+  chre_cross_validation_sensor_Data makeSensorThreeAxisData(
       const chreSensorThreeAxisData *threeAxisDataFromChre, uint8_t sensorType);
 
   /**
@@ -236,7 +237,7 @@ class Manager {
    * @return The Data proto message that is ready to be sent to host with float
    * data.
    */
-  chre_cross_validation_Data makeSensorFloatData(
+  chre_cross_validation_sensor_Data makeSensorFloatData(
       const chreSensorFloatData *floatDataFromChre, uint8_t sensorType);
 
   /**
@@ -246,7 +247,7 @@ class Manager {
    * @return The Data proto message that is ready to be sent to host with float
    * data.
    */
-  chre_cross_validation_Data makeSensorProximityData(
+  chre_cross_validation_sensor_Data makeSensorProximityData(
       const chreSensorByteData *proximityDataFromChre);
 
   /**
@@ -279,7 +280,7 @@ class Manager {
    *
    * @param data The data to encode and send.
    */
-  void encodeAndSendDataToHost(const chre_cross_validation_Data &data);
+  void encodeAndSendDataToHost(const chre_cross_validation_sensor_Data &data);
 
   /**
    * Determine if nanoapp is ready to process new sensor data.
@@ -310,7 +311,7 @@ class Manager {
 // The chre cross validator manager singleton.
 typedef chre::Singleton<Manager> ManagerSingleton;
 
-}  // namespace cross_validator
+}  // namespace cross_validator_sensor
 
 }  // namespace chre
 
diff --git a/apps/test/common/chre_cross_validator/src/chre_cross_validator.cc b/apps/test/common/chre_cross_validator_sensor/src/chre_cross_validator_sensor.cc
index 013da394..2b51b4b1 100644
--- a/apps/test/common/chre_cross_validator/src/chre_cross_validator.cc
+++ b/apps/test/common/chre_cross_validator_sensor/src/chre_cross_validator_sensor.cc
@@ -21,7 +21,7 @@
  * given in start message.
  */
 
-#include "chre_cross_validator_manager.h"
+#include "chre_cross_validator_sensor_manager.h"
 
 /* TODO(b/148481242): Send all errors to host as well as just logging them as
  * errors.
@@ -34,17 +34,17 @@ namespace chre {
 
 extern "C" void nanoappHandleEvent(uint32_t senderInstanceId,
                                    uint16_t eventType, const void *eventData) {
-  cross_validator::ManagerSingleton::get()->handleEvent(senderInstanceId,
-                                                        eventType, eventData);
+  cross_validator_sensor::ManagerSingleton::get()->handleEvent(
+      senderInstanceId, eventType, eventData);
 }
 
 extern "C" bool nanoappStart(void) {
-  cross_validator::ManagerSingleton::init();
+  cross_validator_sensor::ManagerSingleton::init();
   return true;
 }
 
 extern "C" void nanoappEnd(void) {
-  cross_validator::ManagerSingleton::deinit();
+  cross_validator_sensor::ManagerSingleton::deinit();
 }
 
 }  // namespace chre
diff --git a/apps/test/common/chre_cross_validator/src/chre_cross_validator_manager.cc b/apps/test/common/chre_cross_validator_sensor/src/chre_cross_validator_sensor_manager.cc
index d081939c..4d8be7a3 100644
--- a/apps/test/common/chre_cross_validator/src/chre_cross_validator_manager.cc
+++ b/apps/test/common/chre_cross_validator_sensor/src/chre_cross_validator_sensor_manager.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "chre_cross_validator_manager.h"
+#include "chre_cross_validator_sensor_manager.h"
 
 #include <algorithm>
 #include <cinttypes>
@@ -27,15 +27,13 @@
 #include "chre/util/nanoapp/log.h"
 #include "chre/util/optional.h"
 #include "chre/util/time.h"
-#include "chre_cross_validation.nanopb.h"
-
-#include "chre_cross_validator_manager.h"
+#include "chre_cross_validation_sensor.nanopb.h"
 
 #define LOG_TAG "ChreCrossValidator"
 
 namespace chre {
 
-namespace cross_validator {
+namespace cross_validator_sensor {
 
 Manager::~Manager() {
   cleanup();
@@ -112,8 +110,9 @@ bool Manager::encodeThreeAxisSensorDatapointValues(pb_ostream_t *stream,
   for (size_t i = 0; i < 3; i++) {
     if (!pb_encode_tag_for_field(
             stream,
-            &chre_cross_validation_SensorDatapoint_fields
-                [chre_cross_validation_SensorDatapoint_values_tag - 1])) {
+            &chre_cross_validation_sensor_SensorDatapoint_fields
+                [chre_cross_validation_sensor_SensorDatapoint_values_tag -
+                 1])) {
       return false;
     }
     if (!pb_encode_fixed32(stream, &sensorThreeAxisDataSample->values[i])) {
@@ -123,10 +122,10 @@ bool Manager::encodeThreeAxisSensorDatapointValues(pb_ostream_t *stream,
   return true;
 }
 
-chre_cross_validation_SensorDatapoint Manager::makeDatapoint(
+chre_cross_validation_sensor_SensorDatapoint Manager::makeDatapoint(
     bool (*encodeFunc)(pb_ostream_t *, const pb_field_t *, void *const *),
     const void *sampleDataFromChre, uint64_t currentTimestamp) {
-  return chre_cross_validation_SensorDatapoint{
+  return chre_cross_validation_sensor_SensorDatapoint{
       .has_timestampInNs = true,
       .timestampInNs = currentTimestamp,
       .values = {.funcs = {.encode = encodeFunc},
@@ -139,8 +138,9 @@ bool Manager::encodeFloatSensorDatapointValue(pb_ostream_t *stream,
   const auto *sensorFloatDataSample =
       static_cast<const chreSensorFloatData::chreSensorFloatSampleData *>(*arg);
   if (!pb_encode_tag_for_field(
-          stream, &chre_cross_validation_SensorDatapoint_fields
-                      [chre_cross_validation_SensorDatapoint_values_tag - 1])) {
+          stream,
+          &chre_cross_validation_sensor_SensorDatapoint_fields
+              [chre_cross_validation_sensor_SensorDatapoint_values_tag - 1])) {
     return false;
   }
   if (!pb_encode_fixed32(stream, &sensorFloatDataSample->value)) {
@@ -155,8 +155,9 @@ bool Manager::encodeProximitySensorDatapointValue(pb_ostream_t *stream,
   const auto *sensorFloatDataSample =
       static_cast<const chreSensorByteData::chreSensorByteSampleData *>(*arg);
   if (!pb_encode_tag_for_field(
-          stream, &chre_cross_validation_SensorDatapoint_fields
-                      [chre_cross_validation_SensorDatapoint_values_tag - 1])) {
+          stream,
+          &chre_cross_validation_sensor_SensorDatapoint_fields
+              [chre_cross_validation_sensor_SensorDatapoint_values_tag - 1])) {
     return false;
   }
   float isNearFloat = sensorFloatDataSample->isNear ? 0.0 : 1.0;
@@ -179,14 +180,15 @@ bool Manager::encodeThreeAxisSensorDatapoints(pb_ostream_t *stream,
     currentTimestamp += sampleData.timestampDelta;
     if (!pb_encode_tag_for_field(
             stream,
-            &chre_cross_validation_SensorData_fields
-                [chre_cross_validation_SensorData_datapoints_tag - 1])) {
+            &chre_cross_validation_sensor_SensorData_fields
+                [chre_cross_validation_sensor_SensorData_datapoints_tag - 1])) {
       return false;
     }
-    chre_cross_validation_SensorDatapoint datapoint = makeDatapoint(
+    chre_cross_validation_sensor_SensorDatapoint datapoint = makeDatapoint(
         encodeThreeAxisSensorDatapointValues, &sampleData, currentTimestamp);
     if (!pb_encode_submessage(
-            stream, chre_cross_validation_SensorDatapoint_fields, &datapoint)) {
+            stream, chre_cross_validation_sensor_SensorDatapoint_fields,
+            &datapoint)) {
       return false;
     }
   }
@@ -205,14 +207,15 @@ bool Manager::encodeFloatSensorDatapoints(pb_ostream_t *stream,
     currentTimestamp += sampleData.timestampDelta;
     if (!pb_encode_tag_for_field(
             stream,
-            &chre_cross_validation_SensorData_fields
-                [chre_cross_validation_SensorData_datapoints_tag - 1])) {
+            &chre_cross_validation_sensor_SensorData_fields
+                [chre_cross_validation_sensor_SensorData_datapoints_tag - 1])) {
       return false;
     }
-    chre_cross_validation_SensorDatapoint datapoint = makeDatapoint(
+    chre_cross_validation_sensor_SensorDatapoint datapoint = makeDatapoint(
         encodeFloatSensorDatapointValue, &sampleData, currentTimestamp);
     if (!pb_encode_submessage(
-            stream, chre_cross_validation_SensorDatapoint_fields, &datapoint)) {
+            stream, chre_cross_validation_sensor_SensorDatapoint_fields,
+            &datapoint)) {
       return false;
     }
   }
@@ -232,14 +235,15 @@ bool Manager::encodeProximitySensorDatapoints(pb_ostream_t *stream,
     currentTimestamp += sampleData.timestampDelta;
     if (!pb_encode_tag_for_field(
             stream,
-            &chre_cross_validation_SensorData_fields
-                [chre_cross_validation_SensorData_datapoints_tag - 1])) {
+            &chre_cross_validation_sensor_SensorData_fields
+                [chre_cross_validation_sensor_SensorData_datapoints_tag - 1])) {
       return false;
     }
-    chre_cross_validation_SensorDatapoint datapoint = makeDatapoint(
+    chre_cross_validation_sensor_SensorDatapoint datapoint = makeDatapoint(
         encodeProximitySensorDatapointValue, &sampleData, currentTimestamp);
     if (!pb_encode_submessage(
-            stream, chre_cross_validation_SensorDatapoint_fields, &datapoint)) {
+            stream, chre_cross_validation_sensor_SensorDatapoint_fields,
+            &datapoint)) {
       return false;
     }
   }
@@ -247,7 +251,7 @@ bool Manager::encodeProximitySensorDatapoints(pb_ostream_t *stream,
 }
 
 bool Manager::handleStartSensorMessage(
-    const chre_cross_validation_StartSensorCommand &startSensorCommand) {
+    const chre_cross_validation_sensor_StartSensorCommand &startSensorCommand) {
   bool success = false;
   uint8_t sensorType = startSensorCommand.chreSensorType;
   uint64_t intervalFromApInNs =
@@ -309,14 +313,14 @@ void Manager::handleStartMessage(const chreMessageFromHostData *hostData) {
                                              0, hostEndpoint, false);
   pb_istream_t istream = pb_istream_from_buffer(
       static_cast<const pb_byte_t *>(hostData->message), hostData->messageSize);
-  chre_cross_validation_StartCommand startCommand =
-      chre_cross_validation_StartCommand_init_default;
-  if (!pb_decode(&istream, chre_cross_validation_StartCommand_fields,
+  chre_cross_validation_sensor_StartCommand startCommand =
+      chre_cross_validation_sensor_StartCommand_init_default;
+  if (!pb_decode(&istream, chre_cross_validation_sensor_StartCommand_fields,
                  &startCommand)) {
     LOGE("Could not decode start command");
   } else {
     switch (startCommand.which_command) {
-      case chre_cross_validation_StartCommand_startSensorCommand_tag:
+      case chre_cross_validation_sensor_StartCommand_startSensorCommand_tag:
         success =
             handleStartSensorMessage(startCommand.command.startSensorCommand);
         break;
@@ -337,7 +341,7 @@ void Manager::handleMessageFromHost(uint32_t senderInstanceId,
     LOGE("Incorrect sender instance id: %" PRIu32, senderInstanceId);
   } else {
     switch (hostData->messageType) {
-      case chre_cross_validation_MessageType_CHRE_CROSS_VALIDATION_START:
+      case chre_cross_validation_sensor_MessageType_CHRE_CROSS_VALIDATION_START:
         handleStartMessage(hostData);
         break;
       default:
@@ -347,9 +351,9 @@ void Manager::handleMessageFromHost(uint32_t senderInstanceId,
   }
 }
 
-chre_cross_validation_Data Manager::makeSensorThreeAxisData(
+chre_cross_validation_sensor_Data Manager::makeSensorThreeAxisData(
     const chreSensorThreeAxisData *threeAxisDataFromChre, uint8_t sensorType) {
-  chre_cross_validation_SensorData newThreeAxisData = {
+  chre_cross_validation_sensor_SensorData newThreeAxisData = {
       .has_chreSensorType = true,
       .chreSensorType = sensorType,
       .has_accuracy = true,
@@ -357,8 +361,8 @@ chre_cross_validation_Data Manager::makeSensorThreeAxisData(
       .datapoints = {
           .funcs = {.encode = encodeThreeAxisSensorDatapoints},
           .arg = const_cast<chreSensorThreeAxisData *>(threeAxisDataFromChre)}};
-  chre_cross_validation_Data newData = {
-      .which_data = chre_cross_validation_Data_sensorData_tag,
+  chre_cross_validation_sensor_Data newData = {
+      .which_data = chre_cross_validation_sensor_Data_sensorData_tag,
       .data =
           {
               .sensorData = newThreeAxisData,
@@ -367,9 +371,9 @@ chre_cross_validation_Data Manager::makeSensorThreeAxisData(
   return newData;
 }
 
-chre_cross_validation_Data Manager::makeSensorFloatData(
+chre_cross_validation_sensor_Data Manager::makeSensorFloatData(
     const chreSensorFloatData *floatDataFromChre, uint8_t sensorType) {
-  chre_cross_validation_SensorData newfloatData = {
+  chre_cross_validation_sensor_SensorData newfloatData = {
       .has_chreSensorType = true,
       .chreSensorType = sensorType,
       .has_accuracy = true,
@@ -377,8 +381,8 @@ chre_cross_validation_Data Manager::makeSensorFloatData(
       .datapoints = {
           .funcs = {.encode = encodeFloatSensorDatapoints},
           .arg = const_cast<chreSensorFloatData *>(floatDataFromChre)}};
-  chre_cross_validation_Data newData = {
-      .which_data = chre_cross_validation_Data_sensorData_tag,
+  chre_cross_validation_sensor_Data newData = {
+      .which_data = chre_cross_validation_sensor_Data_sensorData_tag,
       .data =
           {
               .sensorData = newfloatData,
@@ -387,9 +391,9 @@ chre_cross_validation_Data Manager::makeSensorFloatData(
   return newData;
 }
 
-chre_cross_validation_Data Manager::makeSensorProximityData(
+chre_cross_validation_sensor_Data Manager::makeSensorProximityData(
     const chreSensorByteData *proximityDataFromChre) {
-  chre_cross_validation_SensorData newProximityData = {
+  chre_cross_validation_sensor_SensorData newProximityData = {
       .has_chreSensorType = true,
       .chreSensorType = CHRE_SENSOR_TYPE_PROXIMITY,
       .has_accuracy = true,
@@ -397,8 +401,8 @@ chre_cross_validation_Data Manager::makeSensorProximityData(
       .datapoints = {
           .funcs = {.encode = encodeProximitySensorDatapoints},
           .arg = const_cast<chreSensorByteData *>(proximityDataFromChre)}};
-  chre_cross_validation_Data newData = {
-      .which_data = chre_cross_validation_Data_sensorData_tag,
+  chre_cross_validation_sensor_Data newData = {
+      .which_data = chre_cross_validation_sensor_Data_sensorData_tag,
       .data =
           {
               .sensorData = newProximityData,
@@ -410,7 +414,7 @@ chre_cross_validation_Data Manager::makeSensorProximityData(
 void Manager::handleSensorThreeAxisData(
     const chreSensorThreeAxisData *threeAxisDataFromChre, uint8_t sensorType) {
   if (processSensorData(threeAxisDataFromChre->header, sensorType)) {
-    chre_cross_validation_Data newData =
+    chre_cross_validation_sensor_Data newData =
         makeSensorThreeAxisData(threeAxisDataFromChre, sensorType);
     encodeAndSendDataToHost(newData);
   }
@@ -419,7 +423,7 @@ void Manager::handleSensorThreeAxisData(
 void Manager::handleSensorFloatData(
     const chreSensorFloatData *floatDataFromChre, uint8_t sensorType) {
   if (processSensorData(floatDataFromChre->header, sensorType)) {
-    chre_cross_validation_Data newData =
+    chre_cross_validation_sensor_Data newData =
         makeSensorFloatData(floatDataFromChre, sensorType);
     encodeAndSendDataToHost(newData);
   }
@@ -429,16 +433,17 @@ void Manager::handleProximityData(
     const chreSensorByteData *proximityDataFromChre) {
   if (processSensorData(proximityDataFromChre->header,
                         CHRE_SENSOR_TYPE_PROXIMITY)) {
-    chre_cross_validation_Data newData =
+    chre_cross_validation_sensor_Data newData =
         makeSensorProximityData(proximityDataFromChre);
     encodeAndSendDataToHost(newData);
   }
 }
 
-void Manager::encodeAndSendDataToHost(const chre_cross_validation_Data &data) {
+void Manager::encodeAndSendDataToHost(
+    const chre_cross_validation_sensor_Data &data) {
   size_t encodedSize;
-  if (!pb_get_encoded_size(&encodedSize, chre_cross_validation_Data_fields,
-                           &data)) {
+  if (!pb_get_encoded_size(&encodedSize,
+                           chre_cross_validation_sensor_Data_fields, &data)) {
     LOGE("Could not get encoded size of data proto message");
   } else {
     pb_byte_t *buffer = static_cast<pb_byte_t *>(chreHeapAlloc(encodedSize));
@@ -446,12 +451,13 @@ void Manager::encodeAndSendDataToHost(const chre_cross_validation_Data &data) {
       LOG_OOM();
     } else {
       pb_ostream_t ostream = pb_ostream_from_buffer(buffer, encodedSize);
-      if (!pb_encode(&ostream, chre_cross_validation_Data_fields, &data)) {
+      if (!pb_encode(&ostream, chre_cross_validation_sensor_Data_fields,
+                     &data)) {
         LOGE("Could not encode data proto message");
       } else if (
           !chreSendMessageToHostEndpoint(
               static_cast<void *>(buffer), encodedSize,
-              chre_cross_validation_MessageType_CHRE_CROSS_VALIDATION_DATA,
+              chre_cross_validation_sensor_MessageType_CHRE_CROSS_VALIDATION_DATA,
               mCrossValidatorState->hostEndpoint, heapFreeMessageCallback)) {
         LOGE("Could not send message to host");
       }
@@ -478,6 +484,6 @@ bool Manager::sensorTypeIsValid(uint8_t sensorType) {
   return sensorType == mCrossValidatorState->sensorType;
 }
 
-}  // namespace cross_validator
+}  // namespace cross_validator_sensor
 
 }  // namespace chre
diff --git a/apps/test/common/proto/Android.bp b/apps/test/common/proto/Android.bp
index b3c1c515..a504ce26 100644
--- a/apps/test/common/proto/Android.bp
+++ b/apps/test/common/proto/Android.bp
@@ -15,10 +15,10 @@
 //
 
 java_library {
-    name: "chrecrossvalidation_java_proto",
+    name: "chrecrossvalidation_sensor_java_proto",
     host_supported: true,
     srcs: [
-        "./chre_cross_validation.proto",
+        "./chre_cross_validation_sensor.proto",
     ],
     proto: {
         type: "lite",
diff --git a/apps/test/common/proto/chre_cross_validation.proto b/apps/test/common/proto/chre_cross_validation_sensor.proto
index c208eaad..a7db174f 100644
--- a/apps/test/common/proto/chre_cross_validation.proto
+++ b/apps/test/common/proto/chre_cross_validation_sensor.proto
@@ -1,9 +1,9 @@
 syntax = "proto2";
 
-package chre_cross_validation;
+package chre_cross_validation_sensor;
 
 option java_package = "com.google.android.chre.nanoapp.proto";
-option java_outer_classname = "ChreCrossValidation";
+option java_outer_classname = "ChreCrossValidationSensor";
 
 // Nanoappp message type can be either host to chre (H2C) or chre to host (C2H)
 enum MessageType {
diff --git a/java/test/cross_validation/Android.bp b/java/test/cross_validation/Android.bp
index e023b42a..ef60703c 100644
--- a/java/test/cross_validation/Android.bp
+++ b/java/test/cross_validation/Android.bp
@@ -20,7 +20,7 @@ java_library {
     static_libs: [
         "chre-test-utils",
         "androidx.test.rules",
-        "chrecrossvalidation_java_proto",
+        "chrecrossvalidation_sensor_java_proto",
         "chrecrossvalidation_wifi_java_proto",
         "chre_test_common_java_proto",
         "guava",
diff --git a/java/test/cross_validation/src/com/google/android/chre/test/crossvalidator/ChreCrossValidatorSensor.java b/java/test/cross_validation/src/com/google/android/chre/test/crossvalidator/ChreCrossValidatorSensor.java
index 4b6c5d97..a79e460b 100644
--- a/java/test/cross_validation/src/com/google/android/chre/test/crossvalidator/ChreCrossValidatorSensor.java
+++ b/java/test/cross_validation/src/com/google/android/chre/test/crossvalidator/ChreCrossValidatorSensor.java
@@ -28,7 +28,7 @@ import android.hardware.location.NanoAppMessage;
 
 import androidx.test.InstrumentationRegistry;
 
-import com.google.android.chre.nanoapp.proto.ChreCrossValidation;
+import com.google.android.chre.nanoapp.proto.ChreCrossValidationSensor;
 import com.google.android.utils.chre.ChreTestUtil;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
@@ -141,17 +141,17 @@ public class ChreCrossValidatorSensor
     * @return The nanoapp message used to start the data collection in chre
     */
     private NanoAppMessage makeStartNanoAppMessage() {
-        int messageType = ChreCrossValidation.MessageType.CHRE_CROSS_VALIDATION_START_VALUE;
-        ChreCrossValidation.StartSensorCommand startSensor =
-                ChreCrossValidation.StartSensorCommand.newBuilder()
+        int messageType = ChreCrossValidationSensor.MessageType.CHRE_CROSS_VALIDATION_START_VALUE;
+        ChreCrossValidationSensor.StartSensorCommand startSensor =
+                ChreCrossValidationSensor.StartSensorCommand.newBuilder()
                 .setChreSensorType(getChreSensorType())
                 .setIntervalInMs(mSamplingIntervalInMs)
                 .setLatencyInMs(SAMPLING_LATENCY_IN_MS)
                 .setIsContinuous(sensorIsContinuous())
                 .build();
-        ChreCrossValidation.StartCommand startCommand =
-                ChreCrossValidation.StartCommand.newBuilder().setStartSensorCommand(startSensor)
-                .build();
+        ChreCrossValidationSensor.StartCommand startCommand =
+                ChreCrossValidationSensor.StartCommand.newBuilder()
+                .setStartSensorCommand(startSensor).build();
         return NanoAppMessage.createMessageToNanoApp(
                 mNappBinary.getNanoAppId(), messageType, startCommand.toByteArray());
     }
@@ -159,9 +159,9 @@ public class ChreCrossValidatorSensor
     @Override
     protected void parseDataFromNanoAppMessage(NanoAppMessage message) {
         final String kParseDataErrorPrefix = "While parsing data from nanoapp: ";
-        ChreCrossValidation.Data dataProto;
+        ChreCrossValidationSensor.Data dataProto;
         try {
-            dataProto = ChreCrossValidation.Data.parseFrom(message.getMessageBody());
+            dataProto = ChreCrossValidationSensor.Data.parseFrom(message.getMessageBody());
         } catch (InvalidProtocolBufferException e) {
             setErrorStr("Error parsing protobuff: " + e);
             return;
@@ -169,7 +169,7 @@ public class ChreCrossValidatorSensor
         if (!dataProto.hasSensorData()) {
             setErrorStr(kParseDataErrorPrefix + "found non sensor type data");
         } else {
-            ChreCrossValidation.SensorData sensorData = dataProto.getSensorData();
+            ChreCrossValidationSensor.SensorData sensorData = dataProto.getSensorData();
             int sensorType = chreToApSensorType(sensorData.getChreSensorType());
             if (!isSensorTypeCurrent(sensorType)) {
                 setErrorStr(
@@ -177,7 +177,7 @@ public class ChreCrossValidatorSensor
                         + "incorrect sensor type %d when expecting %d",
                         sensorType, mSensor.getType()));
             } else {
-                for (ChreCrossValidation.SensorDatapoint datapoint :
+                for (ChreCrossValidationSensor.SensorDatapoint datapoint :
                         sensorData.getDatapointsList()) {
                     int valuesLength = datapoint.getValuesList().size();
                     if (valuesLength != mSensorConfig.expectedValuesLength) {
diff --git a/java/test/cross_validation/src/com/google/android/chre/test/crossvalidator/ChreSensorDatapoint.java b/java/test/cross_validation/src/com/google/android/chre/test/crossvalidator/ChreSensorDatapoint.java
index 5965c2d0..5dc2f9d6 100644
--- a/java/test/cross_validation/src/com/google/android/chre/test/crossvalidator/ChreSensorDatapoint.java
+++ b/java/test/cross_validation/src/com/google/android/chre/test/crossvalidator/ChreSensorDatapoint.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.chre.test.crossvalidator;
 
-import com.google.android.chre.nanoapp.proto.ChreCrossValidation;
+import com.google.android.chre.nanoapp.proto.ChreCrossValidationSensor;
 import com.google.common.primitives.Floats;
 
 /*package*/
@@ -29,7 +29,7 @@ class ChreSensorDatapoint extends SensorDatapoint {
     * @param datapoint The chre cross validation proto message for datapoint from CHRE.
     */
     /*package*/
-    ChreSensorDatapoint(ChreCrossValidation.SensorDatapoint datapoint) {
+    ChreSensorDatapoint(ChreCrossValidationSensor.SensorDatapoint datapoint) {
         timestamp = datapoint.getTimestampInNs();
         values = Floats.toArray(datapoint.getValuesList());
     }