Use TimeUnit.CTS to specify the bucket size in cts.
Test: all statsd unit tests passed
Change-Id: Ie842055cbb23a2a57469cc9465dc398d231bf6d5
diff --git a/tests/src/android/cts/statsd/AtomTestCase.java b/tests/src/android/cts/statsd/AtomTestCase.java
index 729dbb5..f74852b 100644
--- a/tests/src/android/cts/statsd/AtomTestCase.java
+++ b/tests/src/android/cts/statsd/AtomTestCase.java
@@ -27,6 +27,7 @@
import com.android.internal.os.StatsdConfigProto.SimpleAtomMatcher;
import com.android.internal.os.StatsdConfigProto.SimplePredicate;
import com.android.internal.os.StatsdConfigProto.StatsdConfig;
+import com.android.internal.os.StatsdConfigProto.TimeUnit;
import com.android.os.AtomsProto.Atom;
import com.android.os.AtomsProto.ScreenStateChanged;
import com.android.os.StatsLog.ConfigMetricsReport;
@@ -262,7 +263,7 @@
.setId(gaugeName.hashCode())
.setWhat(atomName.hashCode())
.setGaugeFieldsFilter(FieldFilter.newBuilder().setIncludeAll(true).build())
- .setBucket(Bucket.newBuilder().setBucketSizeMillis(1000))
+ .setBucket(TimeUnit.CTS)
.setCondition(predicateName.hashCode());
if (dimension != null) {
gaugeMetric.setDimensions(dimension.build());
diff --git a/tests/src/android/cts/statsd/HostAtomTests.java b/tests/src/android/cts/statsd/HostAtomTests.java
index 281ed51..7d39980 100644
--- a/tests/src/android/cts/statsd/HostAtomTests.java
+++ b/tests/src/android/cts/statsd/HostAtomTests.java
@@ -25,6 +25,7 @@
import com.android.internal.os.StatsdConfigProto.GaugeMetric;
import com.android.internal.os.StatsdConfigProto.StatsdConfig;
import com.android.internal.os.StatsdConfigProto.Subscription;
+import com.android.internal.os.StatsdConfigProto.TimeUnit;
import com.android.internal.os.StatsdConfigProto.ValueMetric;
import com.android.os.AtomsProto.Atom;
import com.android.os.AtomsProto.BatteryLevelChanged;
@@ -381,7 +382,7 @@
.addCountMetric(CountMetric.newBuilder()
.setId("METRIC".hashCode())
.setWhat("SCREEN_TURNED_ON".hashCode())
- .setBucket(Bucket.newBuilder().setBucketSizeMillis(5_000))
+ .setBucket(TimeUnit.CTS)
)
.addAlert(Alert.newBuilder()
.setId("testCountAnomalyDetectionAlert".hashCode())
@@ -430,7 +431,7 @@
.setId("METRIC".hashCode())
.setWhat("SCREEN_IS_ON".hashCode())
.setAggregationType(DurationMetric.AggregationType.SUM)
- .setBucket(Bucket.newBuilder().setBucketSizeMillis(5_000))
+ .setBucket(TimeUnit.CTS)
)
.addAlert(Alert.newBuilder()
.setId("testDurationAnomalyDetectionAlert".hashCode())
@@ -493,7 +494,7 @@
.setField(Atom.SCREEN_STATE_CHANGED_FIELD_NUMBER)
.addChild(FieldMatcher.newBuilder()
.setField(ScreenStateChanged.DISPLAY_STATE_FIELD_NUMBER)))
- .setBucket(Bucket.newBuilder().setBucketSizeMillis(5_000))
+ .setBucket(TimeUnit.CTS)
)
.addAlert(Alert.newBuilder()
.setId("testValueAnomalyDetectionAlert".hashCode())
@@ -539,7 +540,7 @@
.addChild(FieldMatcher.newBuilder()
.setField(ScreenStateChanged.DISPLAY_STATE_FIELD_NUMBER))
))
- .setBucket(Bucket.newBuilder().setBucketSizeMillis(10_000))
+ .setBucket(TimeUnit.CTS)
)
.addAlert(Alert.newBuilder()
.setId("testGaugeAnomalyDetectionAlert".hashCode())
