am dd5c72fb: am 2ed83017: PLMN10 PWS test fails for Taiwan region certification

* commit 'dd5c72fb16aacc35b79112c03724023f59a41972':
  PLMN10 PWS test fails for Taiwan region certification

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