From f2012da846c17ccbcb28ca39db56b8bd8cabb4cf Mon Sep 17 00:00:00 2001
From: Muhammad Qureshi <muhammadq@google.com>
Date: Fri, 27 Mar 2020 12:31:12 -0700
Subject: [PATCH] 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
---
 cmds/statsd/src/logd/LogEvent.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmds/statsd/src/logd/LogEvent.cpp b/cmds/statsd/src/logd/LogEvent.cpp
index b515d0a5b72f5..3b3d0b64bfb32 100644
--- a/cmds/statsd/src/logd/LogEvent.cpp
+++ b/cmds/statsd/src/logd/LogEvent.cpp
@@ -504,12 +504,12 @@ bool LogEvent::parseBuffer(uint8_t* buf, size_t len) {
     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--;