diff options
| -rw-r--r-- | core/res/res/values-mcc334/config.xml | 23 | ||||
| -rw-r--r-- | core/res/res/values-mcc732/config.xml | 23 | ||||
| -rw-r--r-- | core/res/res/values-mcc740/config.xml | 23 | ||||
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 3 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SmsCbMessage.java | 1 |
5 files changed, 73 insertions, 0 deletions
diff --git a/core/res/res/values-mcc334/config.xml b/core/res/res/values-mcc334/config.xml new file mode 100644 index 000000000000..e99c9a028178 --- /dev/null +++ b/core/res/res/values-mcc334/config.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2020, 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-mcc732/config.xml b/core/res/res/values-mcc732/config.xml new file mode 100644 index 000000000000..e99c9a028178 --- /dev/null +++ b/core/res/res/values-mcc732/config.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2020, 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-mcc740/config.xml b/core/res/res/values-mcc740/config.xml new file mode 100644 index 000000000000..e99c9a028178 --- /dev/null +++ b/core/res/res/values-mcc740/config.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2020, 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/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 48a6e4b27494..1bc59248de42 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -377,4 +377,7 @@ applications that come with the platform <permission name="android.permission.MANAGE_DYNAMIC_SYSTEM"/> </privapp-permissions> + <privapp-permissions package="com.android.settings"> + <permission name="android.permission.BIND_CELL_BROADCAST_SERVICE"/> + </privapp-permissions> </permissions> diff --git a/telephony/java/android/telephony/SmsCbMessage.java b/telephony/java/android/telephony/SmsCbMessage.java index c0dfec9a1172..752707e5a5dc 100644 --- a/telephony/java/android/telephony/SmsCbMessage.java +++ b/telephony/java/android/telephony/SmsCbMessage.java @@ -586,6 +586,7 @@ public final class SmsCbMessage implements Parcelable { cv.put(CellBroadcasts.SERIAL_NUMBER, getSerialNumber()); cv.put(CellBroadcasts.SERVICE_CATEGORY, getServiceCategory()); cv.put(CellBroadcasts.LANGUAGE_CODE, getLanguageCode()); + cv.put(CellBroadcasts.DATA_CODING_SCHEME, getDataCodingScheme()); cv.put(CellBroadcasts.MESSAGE_BODY, getMessageBody()); cv.put(CellBroadcasts.MESSAGE_FORMAT, getMessageFormat()); cv.put(CellBroadcasts.MESSAGE_PRIORITY, getMessagePriority()); |