commit c6e249dbfed02705db35838cabb7208e0f1efe59
author Brian Muramatsu <btmura@android.com> Tue Apr 12 12:06:11 2011 -0700
committer Android Code Review <code-review@android.com> Tue Apr 12 12:06:11 2011 -0700
tree 0e81c1597a6976dea3dfe236f94cc388c757b6b2
parent 104ff51a3ef98de6a6f093e7ad42240e888654f2
parent 1c100c9a1111c5e8063c53f658f82bf3164084bf

Merge "StartPreview only after setting fps range paramters" into gingerbread

tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java

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));
         }