Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactored area update info support"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-23 19:08:49 +00:00
committed by Android (Google) Code Review
parent d78dd2555e c6bf961305
commit f43346c19e
5 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values-mcc404/config.xml
View File

@@ -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>

23
core/res/res/values-mcc724/config.xml Normal file
View File

@@ -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>

3
core/res/res/values/config.xml
View File

@@ -2972,4 +2972,7 @@
<!-- Flag indicating that the actions buttons for a notification should be tinted with by the
color supplied by the Notification.Builder if present. -->
<bool name="config_tintNotificationActionButtons">true</bool>
<!-- Show area update info settings in CellBroadcastReceiver and information in SIM status in Settings app -->
<bool name="config_showAreaUpdateInfoSettings">false</bool>
</resources>

1
core/res/res/values/symbols.xml
View File

@@ -3057,4 +3057,5 @@
<java-symbol type="array" name="config_batteryPackageTypeService" />
<java-symbol type="string" name="popup_window_default_title" />
<java-symbol type="bool" name="config_showAreaUpdateInfoSettings" />
</resources>

4
telephony/java/com/android/internal/telephony/gsm/SmsCbConstants.java
View File

@@ -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