diff options
author | aniket <aniket@motorola.com> | 2014-09-12 06:44:56 -0500 |
---|---|---|
committer | John Huang <jsh@google.com> | 2014-10-08 00:11:23 +0000 |
commit | 2ed83017c08758e9f215a3dd36242c17a7c0bc6c (patch) | |
tree | 00dd13c130f57720c6e379bccc1dc7e74b72e902 | |
parent | 6a3e8f62c2a3efc48b5ba5facce1dfc3c21190e3 (diff) | |
download | android_packages_apps_CellBroadcastReceiver-2ed83017c08758e9f215a3dd36242c17a7c0bc6c.tar.gz android_packages_apps_CellBroadcastReceiver-2ed83017c08758e9f215a3dd36242c17a7c0bc6c.tar.bz2 android_packages_apps_CellBroadcastReceiver-2ed83017c08758e9f215a3dd36242c17a7c0bc6c.zip |
PLMN10 PWS test fails for Taiwan region certification
Solution: Update 4383 messageId name as defined in framework
SmsCbConstants.java.
Bug: 17886894
-rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java index cf35df50..3569456e 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java @@ -94,6 +94,8 @@ public class CellBroadcastConfigService extends IntentService { manager.enableCellBroadcast(SmsEnvelope.SERVICE_CATEGORY_CMAS_PRESIDENTIAL_LEVEL_ALERT); } else { manager.enableCellBroadcast(SmsCbConstants.MESSAGE_ID_CMAS_ALERT_PRESIDENTIAL_LEVEL); + // register Taiwan PWS 4383 also, by default + manager.enableCellBroadcast(SmsCbConstants.MESSAGE_ID_CMAS_ALERT_PRESIDENTIAL_LEVEL_LANGUAGE); } } @@ -188,6 +190,7 @@ public class CellBroadcastConfigService extends IntentService { int cmasTestStart = SmsCbConstants.MESSAGE_ID_CMAS_ALERT_REQUIRED_MONTHLY_TEST; int cmasTestEnd = SmsCbConstants.MESSAGE_ID_CMAS_ALERT_OPERATOR_DEFINED_USE; int cmasPresident = SmsCbConstants.MESSAGE_ID_CMAS_ALERT_PRESIDENTIAL_LEVEL; + int cmasTaiwanPWS = SmsCbConstants.MESSAGE_ID_CMAS_ALERT_PRESIDENTIAL_LEVEL_LANGUAGE; // set to CDMA broadcast ID rage if phone is in CDMA mode. boolean isCdma = CellBroadcastReceiver.phoneIsCdma(); @@ -238,6 +241,10 @@ public class CellBroadcastConfigService extends IntentService { } // CMAS Presidential must be on (See 3GPP TS 22.268 Section 6.2). manager.enableCellBroadcast(cmasPresident); + if (!isCdma) { + // register Taiwan PWS 4383 also, by default + manager.enableCellBroadcast(cmasTaiwanPWS); + } } if (DBG) log("enabled emergency cell broadcast channels"); } else { @@ -264,6 +271,10 @@ public class CellBroadcastConfigService extends IntentService { // CMAS Presidential must be on (See 3GPP TS 22.268 Section 6.2). manager.enableCellBroadcast(cmasPresident); + if (!isCdma) { + // register Taiwan PWS 4383 also, by default + manager.enableCellBroadcast(cmasTaiwanPWS); + } } if (DBG) log("disabled emergency cell broadcast channels"); } |