commit b67161164afba2027bac976fddc628e8e0305a57
author Ioana Moraru <ioanamoraru@google.com> Thu Sep 30 20:07:57 2021 +0000
committer Ioana Moraru <ioanamoraru@google.com> Thu Sep 30 20:11:10 2021 +0000
tree 04dd8e7daf73f4f0ea2da1ffa4d8a0812e445f7d
parent adcb6f0e2aa35cc384ace6011973f073d07423a3

Display assertion name for errors in Winscope

Bug: 201523242
Test: upload an error trace and check the errors tab for the assertion
name

Change-Id: Ie76a868cb51fdc41093ec6c0abd364efd1045f61

tools/winscope/src/Searchbar.vue

diff --git a/tools/winscope/src/Searchbar.vue b/tools/winscope/src/Searchbar.vue
index bbfaa0a..c1de4e3 100644
--- a/tools/winscope/src/Searchbar.vue
+++ b/tools/winscope/src/Searchbar.vue
@@ -102,7 +102,7 @@
               class="inline-error"
               @click="setCurrentTimestamp(item.timestamp)"
             >
-              {{item.message}}
+              {{ `${item.assertionName} ${item.message}` }}
             </td>
           </tr>
         </table>

tools/winscope/src/flickerlib/errors/Error.ts

diff --git a/tools/winscope/src/flickerlib/errors/Error.ts b/tools/winscope/src/flickerlib/errors/Error.ts
index 4c08a7d..eb81715 100644
--- a/tools/winscope/src/flickerlib/errors/Error.ts
+++ b/tools/winscope/src/flickerlib/errors/Error.ts
@@ -23,7 +23,8 @@
         proto.message,
         proto.layerId,
         proto.windowToken,
-        proto.taskId
+        proto.taskId,
+        proto.assertionName
     );
     return error;
 }