commit 3c8adc043e5721603b7222df74a0d923dce0de2b
author Muhammad Qureshi <muhammadq@google.com> Fri Mar 27 12:31:12 2020 -0700
committer Muhammad Qureshi <muhammadq@google.com> Fri Mar 27 12:38:00 2020 -0700
tree b38b5a31c368b3fc0387d26b8bb41b0780673fc1
parent a2ad4d6b41356d231e65631f388e4312e4a3a9ef

Fix atom id annotation parsing

Bug: 152633444
Test: m -j cts && m -j CtsStatsdHostTestCases && cts-tradefed run
cts-dev -m CtsStatsdHostTestCases -t
android.cts.statsd.atom.UidAtomTests#testAudioState
Test: bit statsd_test:*

Change-Id: I167012330e431b38b86f190ca6b5d4f90995172f

bin/src/logd/LogEvent.cpp

diff --git a/bin/src/logd/LogEvent.cpp b/bin/src/logd/LogEvent.cpp
index b515d0a..3b3d0b6 100644
--- a/bin/src/logd/LogEvent.cpp
+++ b/bin/src/logd/LogEvent.cpp
@@ -504,12 +504,12 @@
     typeInfo = readNextValue<uint8_t>();
     if (getTypeId(typeInfo) != INT64_TYPE) mValid = false;
     mElapsedTimestampNs = readNextValue<int64_t>();
-    parseAnnotations(getNumAnnotations(typeInfo)); // atom-level annotations
     numElements--;
 
     typeInfo = readNextValue<uint8_t>();
     if (getTypeId(typeInfo) != INT32_TYPE) mValid = false;
     mTagId = readNextValue<int32_t>();
+    parseAnnotations(getNumAnnotations(typeInfo)); // atom-level annotations
     numElements--;