DO NOT MERGE Add missing features of JB and JB MR1
This is already merged into master.
Change-Id: I53f01b14c7247c8f68f6cd4e6cdd4bf64d32ea75
Signed-off-by: Leo Liao <leo_liao@asus.com>
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 afbf97e..ca3c2a9 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
@@ -172,6 +172,10 @@
new Feature(PackageManager.FEATURE_TELEVISION, false),
};
+ public static final Feature[] ALL_JELLY_BEAN_MR1_FEATURES = {
+ new Feature(PackageManager.FEATURE_CAMERA_ANY, false),
+ };
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -202,6 +206,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_MR1) {
+ Collections.addAll(features, ALL_JELLY_BEAN_MR1_FEATURES);
+ }
if (apiVersion >= Build.VERSION_CODES.JELLY_BEAN) {
Collections.addAll(features, ALL_JELLY_BEAN_FEATURES);
}