Change the CP2 logging to be correct order. The order of the logging fields must match the one in atoms.proto.

This issue was initially introduced in T, so we need Dr.No approval to get this in T.

Bug: b/233950995
Change-Id: Ie9a12bc2539a7eac78c20f02b15302badfed77f1

1 files changed, 4 insertions, 1 deletions

diff --git a/src/com/android/providers/contacts/util/LogUtils.java b/src/com/android/providers/contacts/util/LogUtils.java
index 368411c7..23e2b140 100644
--- a/src/com/android/providers/contacts/util/LogUtils.java
+++ b/src/com/android/providers/contacts/util/LogUtils.java
@@ -54,6 +54,9 @@ public class LogUtils {
 
     private static final int STATSD_LOG_ATOM_ID = 301;
 
+
+    // The write methods must be called in the same order as the order of fields in the
+    // atom (frameworks/proto_logging/stats/atoms.proto) definition.
     public static void log(LogFields logFields) {
         StatsLog.write(StatsEvent.newBuilder()
                 .setAtomId(STATSD_LOG_ATOM_ID)
@@ -61,9 +64,9 @@ public class LogUtils {
                 .writeInt(logFields.getUriType())
                 .writeInt(getCallerType(logFields.isCallerIsSyncAdapter()))
                 .writeInt(getResultType(logFields.getException()))
-                .writeInt(logFields.getTaskType())
                 .writeInt(logFields.getResultCount())
                 .writeLong(getLatencyMicros(logFields.getStartNanos()))
+                .writeInt(logFields.getTaskType())
                 .usePooledBuffer()
                 .build());
     }