diff options
| author | Jack Yu <jackyu@google.com> | 2015-09-15 21:22:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-15 21:22:36 +0000 |
| commit | f7a54c75214a368b3e9d64a9db1e4cd8ef96c29e (patch) | |
| tree | 379c37444d67bab4b524e618d87ff9c951c4033a | |
| parent | 65cce1163ef7dc94ed9fe074c1e84ad05c162635 (diff) | |
| parent | 5c99d6fe60b213790fbdaa9d05c5d11fc8a3652c (diff) | |
| download | android_packages_apps_CellBroadcastReceiver-f7a54c75214a368b3e9d64a9db1e4cd8ef96c29e.tar.gz android_packages_apps_CellBroadcastReceiver-f7a54c75214a368b3e9d64a9db1e4cd8ef96c29e.tar.bz2 android_packages_apps_CellBroadcastReceiver-f7a54c75214a368b3e9d64a9db1e4cd8ef96c29e.zip | |
am 5c99d6fe: Make CMAS monthly test messages additional language enabled for all SIMs.
* commit '5c99d6fe60b213790fbdaa9d05c5d11fc8a3652c':
Make CMAS monthly test messages additional language enabled for all SIMs.
| -rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java | 22 |
1 files changed, 6 insertions, 16 deletions
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); |