Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3f0077c authored by Chenjie Yu's avatar Chenjie Yu
Browse files

make proto change backwards compatible

use [deprecated] rather than reserved as this change is for Q and we
expect data from P to come in for a long time.

Bug: 111889247
Test: cts tests that rely on this proto works correctly
Change-Id: Id64b40ab1566f02fc0e19f617ac58bab3adafab5
parent f0c438c3
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ const int FIELD_ID_BUCKET_INFO = 3;
const int FIELD_ID_DIMENSION_LEAF_IN_WHAT = 4;
const int FIELD_ID_DIMENSION_LEAF_IN_CONDITION = 5;
// for ValueBucketInfo
const int FIELD_ID_VALUE_LONG = 3;
const int FIELD_ID_VALUE_DOUBLE = 7;
const int FIELD_ID_VALUE_LONG = 7;
const int FIELD_ID_VALUE_DOUBLE = 8;
const int FIELD_ID_BUCKET_NUM = 4;
const int FIELD_ID_START_BUCKET_ELAPSED_MILLIS = 5;
const int FIELD_ID_END_BUCKET_ELAPSED_MILLIS = 6;
+4 −2
Original line number Diff line number Diff line
@@ -106,10 +106,12 @@ message ValueBucketInfo {

  optional int64 end_bucket_elapsed_nanos = 2;

  optional int64 value = 3 [deprecated = true];

  oneof values {
      int64 value_long = 3;
      int64 value_long = 7;

      double value_double = 7;
      double value_double = 8;
  }

  optional int64 bucket_num = 4;