commit 8a0057331d22091843c1c0b02a30d12fab9ee57a
author Marcin Wojtas <mwojtas@google.com> Wed Oct 05 20:08:49 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 05 20:08:49 2022 +0000
tree 740304339d2a3281d9840603bee29375a3aaf718
parent 7c05b96746ef5845e983b37b9dd8232e83048808
parent 7bdd2994e300bd787688f2f7b1d66277835d859a

Merge "Fix flags checks in V4L2Tracker"

src/trace_processor/importers/ftrace/v4l2_tracker.cc

diff --git a/src/trace_processor/importers/ftrace/v4l2_tracker.cc b/src/trace_processor/importers/ftrace/v4l2_tracker.cc
index 56a2017..ed3a586 100644
--- a/src/trace_processor/importers/ftrace/v4l2_tracker.cc
+++ b/src/trace_processor/importers/ftrace/v4l2_tracker.cc
@@ -510,7 +510,7 @@
     present_flags.push_back("NO_CACHE_CLEAN");
   if (flags & 0x0000e000)
     present_flags.push_back("TIMESTAMP_MASK");
-  if (flags & 0x00000000)
+  if (flags == 0x00000000)
     present_flags.push_back("TIMESTAMP_UNKNOWN");
   if (flags & 0x00002000)
     present_flags.push_back("TIMESTAMP_MONOTONIC");
@@ -518,7 +518,7 @@
     present_flags.push_back("TIMESTAMP_COPY");
   if (flags & 0x00070000)
     present_flags.push_back("TSTAMP_SRC_MASK");
-  if (flags & 0x00000000)
+  if (flags == 0x00000000)
     present_flags.push_back("TSTAMP_SRC_EOF");
   if (flags & 0x00010000)
     present_flags.push_back("TSTAMP_SRC_SOE");
@@ -535,7 +535,7 @@
   std::vector<std::string> present_flags;
 
   if (flags == 0x0000)
-    return kNullStringId;
+    present_flags.push_back("USERBITS_USERDEFINED");
   if (flags & 0x0001)
     present_flags.push_back("FLAG_DROPFRAME");
   if (flags & 0x0002)
@@ -546,8 +546,6 @@
     present_flags.push_back("USERBITS_field(10)");
   if ((flags & 0x000C) == 0x000C)
     present_flags.push_back("USERBITS_field(11)");
-  if (flags == 0x0000)
-    present_flags.push_back("USERBITS_USERDEFINED");
   if (flags & 0x0008)
     present_flags.push_back("USERBITS_8BITCHARS");