am 945ef0b9: (-s ours) am d4446193: Merge "Add missing features of JELLY_BEAN and JELLY_BEAN_MR1 to feature summary list"
# By Leo Liao
# Via Android Git Automerger (1) and others
* commit '945ef0b986175b57c956888289b0656468d26669':
Add missing features of JELLY_BEAN and JELLY_BEAN_MR1 to feature summary list
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 a38f359..afbf97e 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
@@ -169,11 +169,7 @@
};
public static final Feature[] ALL_JELLY_BEAN_FEATURES = {
- new Feature(PackageManager.FEATURE_TELEVISION, false),
- };
-
- public static final Feature[] ALL_JELLY_BEAN_MR1_FEATURES = {
- new Feature(PackageManager.FEATURE_CAMERA_ANY, false),
+ new Feature(PackageManager.FEATURE_TELEVISION, false),
};
@Override
@@ -206,9 +202,6 @@
// 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.JELLY_BEAN_MR1) {
- Collections.addAll(features, ALL_JELLY_BEAN_MR1_FEATURES);
- }
if (apiVersion >= Build.VERSION_CODES.JELLY_BEAN) {
Collections.addAll(features, ALL_JELLY_BEAN_FEATURES);
}