commit ae5e89cc9dd465b6d185394411029697f33a37fb
author Pablo Gamito <pablogamito@google.com> Sat Aug 22 12:10:14 2020 +0200
committer Pablo Gamito <pablogamito@google.com> Mon Aug 24 11:45:40 2020 +0200
tree 9e31f45abc3f1261333d9f61d674ebfd6e666b25
parent 41c5d6566b6892c9a1fabb9ad5c746412a4ceba5

Update the protolog's proto file location and package name

Test: Run winscope and make sure we can record a trace
Fixes: 165535205
Change-Id: Idc15e0aee4c0ec289435d4a980dbf9f0482b74c4

tools/winscope/src/decode.js

diff --git a/tools/winscope/src/decode.js b/tools/winscope/src/decode.js
index 6ff6971..8f27fff 100644
--- a/tools/winscope/src/decode.js
+++ b/tools/winscope/src/decode.js
@@ -16,7 +16,7 @@
 
 
 import jsonProtoDefsWm from 'frameworks/base/core/proto/android/server/windowmanagertrace.proto'
-import jsonProtoDefsProtoLog from 'frameworks/base/core/proto/android/server/protolog.proto'
+import jsonProtoDefsProtoLog from 'frameworks/base/core/proto/android/internal/protolog.proto'
 import jsonProtoDefsSf from 'frameworks/native/services/surfaceflinger/layerproto/layerstrace.proto'
 import jsonProtoDefsTransaction from 'frameworks/native/cmds/surfacereplayer/proto/src/trace.proto'
 import jsonProtoDefsWl from 'WaylandSafePath/waylandtrace.proto'
@@ -40,7 +40,7 @@
 var SfTransactionTraceMessage = lookup_type(jsonProtoDefsTransaction, "Trace");
 var WaylandTraceMessage = lookup_type(jsonProtoDefsWl, "org.chromium.arc.wayland_composer.TraceFileProto");
 var WaylandDumpMessage = lookup_type(jsonProtoDefsWl, "org.chromium.arc.wayland_composer.OutputStateProto");
-var ProtoLogMessage = lookup_type(jsonProtoDefsProtoLog, "com.android.server.protolog.ProtoLogFileProto");
+var ProtoLogMessage = lookup_type(jsonProtoDefsProtoLog, "com.android.internal.protolog.ProtoLogFileProto");
 var SystemUiTraceMessage = lookup_type(jsonProtoDefsSysUi, "com.android.systemui.tracing.SystemUiTraceFileProto");
 var LauncherTraceMessage = lookup_type(jsonProtoDefsLauncher, "com.android.launcher3.tracing.LauncherTraceFileProto");