From 5c99d6fe60b213790fbdaa9d05c5d11fc8a3652c Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Tue, 15 Sep 2015 10:23:08 -0700
Subject: Make CMAS monthly test messages additional language enabled for all
 SIMs.

Before we only enabled this for Taiwan SIMs (mcc: 466), now make this
changes apply for all SIMs because the when Taiwanese government tests
this, they don't use Taiwanese SIMs.

bug:23892625
Change-Id: I670025231d7bdca1d11e25c2ecfba9f473f44f28
---
 .../CellBroadcastConfigService.java                | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'src/com')

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
index fd5daf9a..88e5c743 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
@@ -273,14 +273,9 @@ public class CellBroadcastConfigService extends IntentService {
                             manager.enableCellBroadcast(
                                     SmsEnvelope.SERVICE_CATEGORY_CMAS_TEST_MESSAGE,
                                     SmsManager.CELL_BROADCAST_RAN_TYPE_CDMA);
-                            if ("tw".equals(tm.getSimCountryIso()) ||
-                                    "tw".equals(tm.getNetworkCountryIso())) {
-                                if (DBG) log("enabling channels 4393-4395 for Taiwan");
-
-                                manager.enableCellBroadcastRange(
-                                        cmasTestLanguageStart, cmasTestLanguageEnd,
-                                        SmsManager.CELL_BROADCAST_RAN_TYPE_GSM);
-                            }
+                            manager.enableCellBroadcastRange(
+                                    cmasTestLanguageStart, cmasTestLanguageEnd,
+                                    SmsManager.CELL_BROADCAST_RAN_TYPE_GSM);
                         }
                     }
                     if (DBG) log("enabled emergency cell broadcast channels");
@@ -400,14 +395,9 @@ public class CellBroadcastConfigService extends IntentService {
                             SmsManager.CELL_BROADCAST_RAN_TYPE_GSM);
                     manager.disableCellBroadcast(SmsEnvelope.SERVICE_CATEGORY_CMAS_TEST_MESSAGE,
                             SmsManager.CELL_BROADCAST_RAN_TYPE_CDMA);
-                    if ("tw".equals(tm.getSimCountryIso()) ||
-                            "tw".equals(tm.getNetworkCountryIso())) {
-                        if (DBG) log("disabling channels 4393-4395 for Taiwan");
-
-                        manager.disableCellBroadcastRange(
-                                cmasTestLanguageStart, cmasTestLanguageEnd,
-                                SmsManager.CELL_BROADCAST_RAN_TYPE_GSM);
-                    }
+                    manager.disableCellBroadcastRange(
+                            cmasTestLanguageStart, cmasTestLanguageEnd,
+                            SmsManager.CELL_BROADCAST_RAN_TYPE_GSM);
                 }
             } catch (Exception ex) {
                 Log.e(TAG, "exception enabling cell broadcast channels", ex);
-- 
cgit v1.2.3