am 8d00b365: resolved conflicts for merge of 545e9b30 to gingerbread
* commit '8d00b365c5d48e4a3fd7f0d8916e41cec073f852':
Update lists of Japanese network operators
diff --git a/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java b/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
index 2a0bcbe..44af455 100755
--- a/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
@@ -65,19 +65,30 @@
"45008", // KT Mobility
"45006", // LGT
"311660", // MetroPCS
- "310120" // Sprint
+ "310120", // Sprint
+ "44053", // KDDI
+ "44054", // KDDI
+ "44070", // KDDI
+ "44071", // KDDI
+ "44072", // KDDI
+ "44073", // KDDI
+ "44074", // KDDI
+ "44075", // KDDI
+ "44076" // KDDI
);
// List of network operators that doesn't support Data(binary) SMS message
private static final List<String> UNSUPPORT_DATA_SMS_MESSAGES =
Arrays.asList(
- "44010" // NTT DOCOMO
+ "44010", // NTT DOCOMO
+ "44020" // SBM
);
// List of network operators that doesn't support Maltipart SMS message
private static final List<String> UNSUPPORT_MULTIPART_SMS_MESSAGES =
Arrays.asList(
- "44010" // NTT DOCOMO
+ "44010", // NTT DOCOMO
+ "44020" // SBM
);
private TelephonyManager mTelephonyManager;