Merge "StartPreview only after setting fps range paramters" into gingerbread
diff --git a/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java b/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
index 8483fbb..381c97f 100755
--- a/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
@@ -63,7 +63,8 @@
"45005", // SKT Mobility
"45002", // SKT Mobility
"45008", // KT Mobility
- "45006" // LGT
+ "45006", // LGT
+ "311660" // MetroPCS
);
// List of network operators that doesn't support Data(binary) SMS message
@@ -103,11 +104,8 @@
if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
mDeliveryReportSupported = false;
- } else if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {
- // CDMA supports SMS delivery report
- mDeliveryReportSupported = true;
} else {
- // is this a GSM network that doesn't support SMS delivery report?
+ // exclude the networks that don't support SMS delivery report
String mccmnc = mTelephonyManager.getSimOperator();
mDeliveryReportSupported = !(NO_DELIVERY_REPORTS.contains(mccmnc));
}