Modifying CTS for new ECG feature
Change-Id: Iee0ec3dc15e9b940b8ac34617ed48deb6e0248d1
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
index 581121e..6319133 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
@@ -192,6 +192,10 @@
new Feature(PackageManager.FEATURE_SENSOR_HEART_RATE, false),
};
+ public static final Feature[] ALL_LMP_FEATURES = {
+ new Feature(PackageManager.FEATURE_SENSOR_HEART_RATE_ECG, false),
+ };
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -222,6 +226,9 @@
// add features from latest to last so that the latest requirements are put in the set first
int apiVersion = Build.VERSION.SDK_INT;
+ if (apiVersion >= Build.VERSION_CODES.L) {
+ Collections.addAll(features, ALL_LMP_FEATURES);
+ }
if (apiVersion >= Build.VERSION_CODES.KITKAT_WATCH) {
Collections.addAll(features, ALL_KITKAT_WATCH_FEATURES);
}
diff --git a/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java b/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
index c4318d8..cacebdfa 100644
--- a/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
+++ b/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
@@ -239,6 +239,8 @@
Sensor.TYPE_STEP_DETECTOR);
assertFeatureForSensor(featuresLeft, PackageManager.FEATURE_SENSOR_HEART_RATE,
Sensor.TYPE_HEART_RATE);
+ assertFeatureForSensor(featuresLeft, PackageManager.FEATURE_SENSOR_HEART_RATE_ECG,
+ Sensor.TYPE_HEART_RATE);
assertTrue("Assertions need to be added to this test for " + featuresLeft,
featuresLeft.isEmpty());
