Add CarData ID validation

- Change CarData ID range, as we will never reach 10k
- Protos will be used when parsing data in CarTelemetryService,
  so it's ok to include them

Bug: 189142577
Test: atest CarServiceUnitTest:CarTelemetrydPublisherTest
Change-Id: I191a2bdf3154997e046978b1ea5c53bb2f643526

2 files changed, 9 insertions, 3 deletions

diff --git a/cpp/telemetry/proto/Android.bp b/cpp/telemetry/proto/Android.bp
index 862a53734a..53be1a4594 100644
--- a/cpp/telemetry/proto/Android.bp
+++ b/cpp/telemetry/proto/Android.bp
@@ -24,3 +24,9 @@ filegroup {
         "evs.proto",
     ],
 }
+
+filegroup {
+    name: "cartelemetry-cardata-proto-srcs",
+    srcs: ["*.proto"],
+}
+
diff --git a/cpp/telemetry/proto/CarData.proto b/cpp/telemetry/proto/CarData.proto
index 3440689ec1..e5e9b38b3d 100644
--- a/cpp/telemetry/proto/CarData.proto
+++ b/cpp/telemetry/proto/CarData.proto
@@ -41,8 +41,8 @@ message CarData {
     EvsFirstFrameLatency evs_first_frame_latency = 1;
   }
 
-  // DO NOT USE field numbers above 100,000 in AOSP.
-  // Field numbers 100,000 - 199,999 are reserved for non-AOSP (e.g. OEMs) to
-  // use. Field numbers 200,000 and above are reserved for future use; do not
+  // DO NOT USE field numbers above 10,000 in AOSP.
+  // Field numbers 10,000 - 19,999 are reserved for non-AOSP (e.g. OEMs) to
+  // use. Field numbers 20,000 and above are reserved for future use; do not
   // use them at all.
 }