am 0f39674f: am 86632c90: am 29d74ad5: Merge "Add missing features of JELLY_BEAN to feature list" into jb-dev
# By Leo Liao
# Via Android Git Automerger (2) and others
* commit '0f39674fa6ff09f03f89bc6ad88db4acdf2d0baf':
Add missing features of JELLY_BEAN to feature 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 3ea9451..afbf97e 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
@@ -168,6 +168,10 @@
new Feature(PackageManager.FEATURE_WIFI_DIRECT, false),
};
+ public static final Feature[] ALL_JELLY_BEAN_FEATURES = {
+ new Feature(PackageManager.FEATURE_TELEVISION, false),
+ };
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -198,6 +202,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.JELLY_BEAN) {
+ Collections.addAll(features, ALL_JELLY_BEAN_FEATURES);
+ }
if (apiVersion >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
Collections.addAll(features, ALL_ICE_CREAM_SANDWICH_FEATURES);
}