Snap for 7901677 from 6ab21ee8995234698300b94ba1c9ba0ab9507b03 to sc-platform-releaseandroid-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r3android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10

Change-Id: I2ce8c15826ad7842c174793315040a0c543a3fd4

4 files changed, 27 insertions, 9 deletions

diff --git a/statsd/src/stats_log.proto b/statsd/src/stats_log.proto
index f99af10d..a34d1980 100644
--- a/statsd/src/stats_log.proto
+++ b/statsd/src/stats_log.proto
@@ -50,12 +50,20 @@ message StateValue {
   }
 }
 
+message AggregatedAtomInfo {
+    optional Atom atom = 1;
+
+    repeated int64 elapsed_timestamp_nanos = 2;
+}
+
 message EventMetricData {
   optional int64 elapsed_timestamp_nanos = 1;
 
   optional Atom atom = 2;
 
   optional int64 wall_clock_timestamp_nanos = 3 [deprecated = true];
+
+  optional AggregatedAtomInfo aggregated_atom_info = 4;
 }
 
 message CountBucketInfo {
@@ -176,6 +184,8 @@ message GaugeBucketInfo {
   optional int64 start_bucket_elapsed_millis = 7;
 
   optional int64 end_bucket_elapsed_millis = 8;
+
+  repeated AggregatedAtomInfo aggregated_atom_info = 9;
 }
 
 message GaugeMetricData {
diff --git a/statsd/src/statsd_config.proto b/statsd/src/statsd_config.proto
index e6bbbfbb..37523755 100644
--- a/statsd/src/statsd_config.proto
+++ b/statsd/src/statsd_config.proto
@@ -233,6 +233,8 @@ message CountMetric {
 
   optional UploadThreshold threshold = 10;
 
+  optional bool split_bucket_for_app_upgrade = 11 [default = true];
+
   optional FieldMatcher dimensions_in_condition = 7 [deprecated = true];
 
   reserved 100;
@@ -265,6 +267,8 @@ message DurationMetric {
 
   optional UploadThreshold threshold = 11;
 
+  optional bool split_bucket_for_app_upgrade = 12 [default = true];
+
   optional FieldMatcher dimensions_in_condition = 8 [deprecated = true];
 
   reserved 100;
diff --git a/tests/src/android/cts/statsd/alert/AnomalyDetectionTests.java b/tests/src/android/cts/statsd/alert/AnomalyDetectionTests.java
index f2df5306..69e626c2 100644
--- a/tests/src/android/cts/statsd/alert/AnomalyDetectionTests.java
+++ b/tests/src/android/cts/statsd/alert/AnomalyDetectionTests.java
@@ -36,7 +36,7 @@ import com.android.internal.os.StatsdConfigProto.ValueMetric;
 import com.android.os.AtomsProto.AnomalyDetected;
 import com.android.os.AtomsProto.AppBreadcrumbReported;
 import com.android.os.AtomsProto.Atom;
-import com.android.os.AtomsProto.KernelWakelock;
+import com.android.os.AtomsProto.CpuActiveTime;
 import com.android.os.StatsLog.EventMetricData;
 import com.android.tradefed.log.LogUtil.CLog;
 import java.util.List;
@@ -370,9 +370,10 @@ public class AnomalyDetectionTests extends AtomTestCase {
 
     // Test that anomaly detection for pulled metrics work.
     public void testPulledAnomalyDetection() throws Exception {
-        final int ATOM_ID = Atom.KERNEL_WAKELOCK_FIELD_NUMBER;  // A pulled atom
-        final int SLICE_BY_FIELD = KernelWakelock.NAME_FIELD_NUMBER;
-        final int VALUE_FIELD = KernelWakelock.VERSION_FIELD_NUMBER;  // Something that will be > 0.
+        final int ATOM_ID = Atom.CPU_ACTIVE_TIME_FIELD_NUMBER; // A pulled atom
+        final int SLICE_BY_FIELD = CpuActiveTime.UID_FIELD_NUMBER;
+        final int VALUE_FIELD =
+                CpuActiveTime.TIME_MILLIS_FIELD_NUMBER; // Something that will be > 0.
         final int ATOM_MATCHER_ID = 300;
 
         StatsdConfig.Builder config = getBaseConfig(10, 20, 0 /* threshold: value > 0 */)
diff --git a/tests/src/android/cts/statsd/metric/CountMetricsTests.java b/tests/src/android/cts/statsd/metric/CountMetricsTests.java
index dd1240f2..ef077f34 100644
--- a/tests/src/android/cts/statsd/metric/CountMetricsTests.java
+++ b/tests/src/android/cts/statsd/metric/CountMetricsTests.java
@@ -253,11 +253,14 @@ public class CountMetricsTests extends DeviceAtomTestCase {
     public void testPartialBucketCountMetric() throws Exception {
         int matcherId = 1;
         StatsdConfigProto.StatsdConfig.Builder builder = createConfigBuilder();
-        builder.addCountMetric(StatsdConfigProto.CountMetric.newBuilder()
-                .setId(MetricsUtils.COUNT_METRIC_ID)
-                .setBucket(StatsdConfigProto.TimeUnit.ONE_DAY)  // Should ensure partial bucket.
-                .setWhat(matcherId))
-                .addAtomMatcher(MetricsUtils.simpleAtomMatcher(matcherId));
+        builder
+            .addCountMetric(
+                StatsdConfigProto.CountMetric.newBuilder()
+                    .setId(MetricsUtils.COUNT_METRIC_ID)
+                    .setBucket(StatsdConfigProto.TimeUnit.ONE_DAY) // Ensures partial bucket.
+                    .setWhat(matcherId)
+                    .setSplitBucketForAppUpgrade(true))
+            .addAtomMatcher(MetricsUtils.simpleAtomMatcher(matcherId));
         uploadConfig(builder);
 
         doAppBreadcrumbReportedStart(0);