diff options
| author | Jake Hamby <jhamby@google.com> | 2012-07-25 23:05:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-25 23:05:25 -0700 |
| commit | a6b55dcb21ebc8e781d3031ff2de74e23427abb1 (patch) | |
| tree | ed155fed1f0b50c4823fa3dcc57f76a21c509394 /tests/telephonytests | |
| parent | 067196df27214e8203369b013023887919a10aff (diff) | |
| parent | 324dd8d12e3c3df713e981119d8e88c6afefa962 (diff) | |
| download | frameworks_opt_telephony-a6b55dcb21ebc8e781d3031ff2de74e23427abb1.zip frameworks_opt_telephony-a6b55dcb21ebc8e781d3031ff2de74e23427abb1.tar.gz frameworks_opt_telephony-a6b55dcb21ebc8e781d3031ff2de74e23427abb1.tar.bz2 | |
am 324dd8d1: am b8a13d30: Implement CMAS service category program results.
* commit '324dd8d12e3c3df713e981119d8e88c6afefa962':
Implement CMAS service category program results.
Diffstat (limited to 'tests/telephonytests')
| -rw-r--r-- | tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java b/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java index d2faceb..a95f60c 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java +++ b/tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java @@ -635,7 +635,7 @@ public class CdmaSmsCbTest extends AndroidTestCase { assertEquals(CdmaSmsCbProgramData.OPERATION_ADD_CATEGORY, programData.getOperation()); assertEquals(SmsEnvelope.SERVICE_CATEGORY_CMAS_EXTREME_THREAT, programData.getCategory()); assertEquals(CAT_EXTREME_THREAT, programData.getCategoryName()); - assertEquals("en", programData.getLanguageCode()); + assertEquals(BearerData.LANGUAGE_ENGLISH, programData.getLanguage()); assertEquals(100, programData.getMaxMessages()); assertEquals(CdmaSmsCbProgramData.ALERT_OPTION_DEFAULT_ALERT, programData.getAlertOption()); } @@ -692,7 +692,7 @@ public class CdmaSmsCbTest extends AndroidTestCase { assertEquals(CdmaSmsCbProgramData.OPERATION_DELETE_CATEGORY, programData.getOperation()); assertEquals(SmsEnvelope.SERVICE_CATEGORY_CMAS_SEVERE_THREAT, programData.getCategory()); assertEquals(CAT_SEVERE_THREAT, programData.getCategoryName()); - assertEquals("en", programData.getLanguageCode()); + assertEquals(BearerData.LANGUAGE_ENGLISH, programData.getLanguage()); assertEquals(0, programData.getMaxMessages()); assertEquals(CdmaSmsCbProgramData.ALERT_OPTION_NO_ALERT, programData.getAlertOption()); @@ -701,7 +701,7 @@ public class CdmaSmsCbTest extends AndroidTestCase { assertEquals(SmsEnvelope.SERVICE_CATEGORY_CMAS_CHILD_ABDUCTION_EMERGENCY, programData.getCategory()); assertEquals(CAT_AMBER_ALERTS, programData.getCategoryName()); - assertEquals("en", programData.getLanguageCode()); + assertEquals(BearerData.LANGUAGE_ENGLISH, programData.getLanguage()); assertEquals(0, programData.getMaxMessages()); assertEquals(CdmaSmsCbProgramData.ALERT_OPTION_NO_ALERT, programData.getAlertOption()); } |