commit 9abac8a77fa8d09ca1c97a80b0ab5f36bdaf24ad
author Pablo Gamito <pablogamito@google.com> Mon Feb 26 20:47:50 2024 +0000
committer Pablo Gamito <pablogamito@google.com> Wed Feb 28 15:12:24 2024 +0000
tree f7dd9ecb1a8780e1b40fc30acb93778a83f8cfba
parent 887a29ccaf8f318dc9824424eec782a5b33b7748

Increment protolog version

Because we now dump 64 bit integers instead of 32 bit integers we need to have a different protolog version so we know which viewer config to use in Winscope

Bug: 327002914

Test: collected protolog trace in Winscope
Change-Id: Iab3071952ff7957a11a0f01f09cfaa4306a7f7ae

core/java/com/android/internal/protolog/LegacyProtoLogImpl.java

diff --git a/core/java/com/android/internal/protolog/LegacyProtoLogImpl.java b/core/java/com/android/internal/protolog/LegacyProtoLogImpl.java
index d9ac5a9..30de546 100644
--- a/core/java/com/android/internal/protolog/LegacyProtoLogImpl.java
+++ b/core/java/com/android/internal/protolog/LegacyProtoLogImpl.java
@@ -61,7 +61,7 @@
     private static final int PER_CHUNK_SIZE = 1024;
     private static final String TAG = "ProtoLog";
     private static final long MAGIC_NUMBER_VALUE = ((long) MAGIC_NUMBER_H << 32) | MAGIC_NUMBER_L;
-    static final String PROTOLOG_VERSION = "1.0.0";
+    static final String PROTOLOG_VERSION = "2.0.0";
     private static final int DEFAULT_PER_CHUNK_SIZE = 0;
 
     private final File mLogFile;

data/etc/services.core.protolog.json

diff --git a/data/etc/services.core.protolog.json b/data/etc/services.core.protolog.json
index e8c7a53..0231d3a 100644
--- a/data/etc/services.core.protolog.json
+++ b/data/etc/services.core.protolog.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0",
+  "version": "2.0.0",
   "messages": {
     "7286191062634870297": {
       "message": "Binding proc %s with config %s",

tools/protologtool/src/com/android/protolog/tool/Constants.kt

diff --git a/tools/protologtool/src/com/android/protolog/tool/Constants.kt b/tools/protologtool/src/com/android/protolog/tool/Constants.kt
index aa3e00f..4a93de9 100644
--- a/tools/protologtool/src/com/android/protolog/tool/Constants.kt
+++ b/tools/protologtool/src/com/android/protolog/tool/Constants.kt
@@ -18,7 +18,7 @@
 
 object Constants {
         const val NAME = "protologtool"
-        const val VERSION = "1.0.0"
+        const val VERSION = "2.0.0"
         const val IS_ENABLED_METHOD = "isEnabled"
         const val ENUM_VALUES_METHOD = "values"
 }