diff options
| -rw-r--r-- | core/res/res/values-mcc404/config.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values-mcc724/config.xml | 23 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/SmsCbConstants.java | 4 |
5 files changed, 29 insertions, 4 deletions
diff --git a/core/res/res/values-mcc404/config.xml b/core/res/res/values-mcc404/config.xml index 6b77e9c1663a..4cadef7893d3 100644 --- a/core/res/res/values-mcc404/config.xml +++ b/core/res/res/values-mcc404/config.xml @@ -20,4 +20,6 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Whether camera shutter sound is forced or not (country specific). --> <bool name="config_camera_sound_forced">true</bool> + <!-- Show area update info settings in CellBroadcastReceiver and information in SIM status in Settings app --> + <bool name="config_showAreaUpdateInfoSettings">true</bool> </resources> diff --git a/core/res/res/values-mcc724/config.xml b/core/res/res/values-mcc724/config.xml new file mode 100644 index 000000000000..98f70d5441d2 --- /dev/null +++ b/core/res/res/values-mcc724/config.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2017, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Show area update info settings in CellBroadcastReceiver and information in SIM status in Settings app --> + <bool name="config_showAreaUpdateInfoSettings">true</bool> +</resources> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 78492452143f..16eb2161651d 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2975,4 +2975,7 @@ <!-- Decide whether to display 'No service' on status bar instead of 'Emergency calls only' when SIM is unready. --> <bool name="config_display_no_service_when_sim_unready">false</bool> + + <!-- Show area update info settings in CellBroadcastReceiver and information in SIM status in Settings app --> + <bool name="config_showAreaUpdateInfoSettings">false</bool> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 47243993c658..085beca8ce9b 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3039,4 +3039,5 @@ <java-symbol type="array" name="config_batteryPackageTypeService" /> <java-symbol type="bool" name="config_display_no_service_when_sim_unready" /> + <java-symbol type="bool" name="config_showAreaUpdateInfoSettings" /> </resources> diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsCbConstants.java b/telephony/java/com/android/internal/telephony/gsm/SmsCbConstants.java index f28d1263d13a..0fabc2ff6b86 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SmsCbConstants.java +++ b/telephony/java/com/android/internal/telephony/gsm/SmsCbConstants.java @@ -30,10 +30,6 @@ public class SmsCbConstants { /** Private constructor for utility class. */ private SmsCbConstants() { } - /** Channel 50 required by Brazil. ID 0~999 is allocated by GSMA */ - public static final int MESSAGE_ID_GSMA_ALLOCATED_CHANNEL_50 - = 0x0032; - /** Start of PWS Message Identifier range (includes ETWS and CMAS). */ public static final int MESSAGE_ID_PWS_FIRST_IDENTIFIER = 0x1100; // 4352 |