From b8a13d300b245e0080aa01275e232f54d5d0e09c Mon Sep 17 00:00:00 2001 From: Jake Hamby Date: Tue, 24 Jul 2012 15:39:45 -0700 Subject: Implement CMAS service category program results. Correctly handle CDMA Service Category Program Data requests, and send the SCPT response to the message center. Parcel SCPD operations as an ArrayList instead of an array (current version will throw ClassCastException when the array is cast). Bug: 6853691 Change-Id: I949ea68891c78306059248832e59a593ab606e11 --- .../src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') 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()); } -- cgit v1.1