Merge "Add CTS test for MediaStore column IS_DRM."
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 b7300ba..a16fb2b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
@@ -153,10 +153,18 @@
new Feature("android.software.sip.voip", false),
};
+ public static final Feature[] ALL_GINGERBREAD_MR1_FEATURES = {
+ new Feature("android.hardware.usb.accessory", false),
+ };
+
public static final Feature[] ALL_HONEYCOMB_FEATURES = {
new Feature("android.hardware.faketouch", true),
};
+ public static final Feature[] ALL_HONEYCOMB_MR1_FEATURES = {
+ new Feature("android.hardware.usb.host", false),
+ };
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -187,6 +195,15 @@
// 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.HONEYCOMB_MR1) {
+ Collections.addAll(features, ALL_HONEYCOMB_MR1_FEATURES);
+ }
+ if (apiVersion >= Build.VERSION_CODES.HONEYCOMB) {
+ Collections.addAll(features, ALL_HONEYCOMB_FEATURES);
+ }
+ if (apiVersion >= Build.VERSION_CODES.GINGERBREAD_MR1) {
+ Collections.addAll(features, ALL_GINGERBREAD_MR1_FEATURES);
+ }
if (apiVersion >= Build.VERSION_CODES.GINGERBREAD) {
Collections.addAll(features, ALL_GINGERBREAD_FEATURES);
}
@@ -196,9 +213,6 @@
if (apiVersion >= Build.VERSION_CODES.ECLAIR_MR1) {
Collections.addAll(features, ALL_ECLAIR_FEATURES);
}
- if (apiVersion >= Build.VERSION_CODES.HONEYCOMB) {
- Collections.addAll(features, ALL_HONEYCOMB_FEATURES);
- }
for (Feature f : features) {
HashMap<String, Object> row = new HashMap<String, Object>();
listViewData.add(row);
diff --git a/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java b/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
index 83a5df5..7b56b56 100644
--- a/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
@@ -105,7 +105,8 @@
"302720", // Rogers
"30272", // Rogers
"302370", // Fido
- "30237" // Fido
+ "30237", // Fido
+ "45008" // KT
);
private TelephonyManager mTelephonyManager;