Merge "[5/n] Log cardinality to StatsLogManager" into udc-dev

quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java

@@ -494,6 +494,7 @@ public class StatsLogCompatManager extends StatsLogManager {
         private long mLatencyInMillis;
         private int mQueryLength = -1;
         private int mSubEventType = 0;
+        private int mCardinality = -1;
 
         @Override
         public StatsLatencyLogger withInstanceId(InstanceId instanceId) {
@@ -531,6 +532,12 @@ public class StatsLogCompatManager extends StatsLogManager {
             return this;
         }
 
+        @Override
+        public StatsLatencyLogger withCardinality(int cardinality) {
+            this.mCardinality = cardinality;
+            return this;
+        }
+
         @Override
         public void log(EventEnum event) {
             if (IS_VERBOSE) {
@@ -549,7 +556,8 @@ public class StatsLogCompatManager extends StatsLogManager {
                     mLatencyInMillis, // latency_in_millis
                     mType.getId(), //type
                     mQueryLength, // query_length
-                    mSubEventType // sub_event_type
+                    mSubEventType, // sub_event_type
+                    mCardinality // cardinality
             );
         }
     }

src/com/android/launcher3/logging/StatsLogManager.java

@@ -891,6 +891,12 @@ public class StatsLogManager implements ResourceBasedOverride {
             return this;
         }
 
+
+        /** Sets cardinality of the event. */
+        default StatsLatencyLogger withCardinality(int cardinality) {
+            return this;
+        }
+
         /**
          * Sets packageId of log message.
          */