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

Merge "Add a carrier config for two digital number pattern" into rvc-dev

Browse Source
This commit is contained in:
James Lin
2020-03-11 09:35:21 +00:00
committed by Android (Google) Code Review
parent 717f5ca8f9 8da1b07e03
commit 5dd0e09694
11 changed files with 14 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/res/res/values-mcc219/config.xml
View File

@@ -1,32 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2009, 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.
*/
-->
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
<!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD -->
<string-array name="config_twoDigitNumberPattern">
<item>"92"</item>
<item>"93"</item>
<item>"94"</item>
<item>"95"</item>
<item>"96"</item>
</string-array>
</resources>

32
core/res/res/values-mcc220/config.xml
View File

@@ -1,32 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2009, 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.
*/
-->
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
<!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD -->
<string-array name="config_twoDigitNumberPattern">
<item>"92"</item>
<item>"93"</item>
<item>"94"</item>
<item>"95"</item>
<item>"96"</item>
</string-array>
</resources>

45
core/res/res/values-mcc310-mnc150/config.xml
View File

@@ -1,45 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2013, 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">
<string-array translatable="false" name="config_twoDigitNumberPattern">
<item>"0"</item>
<item>"00"</item>
<item>"*0"</item>
<item>"*1"</item>
<item>"*2"</item>
<item>"*3"</item>
<item>"*4"</item>
<item>"*5"</item>
<item>"*6"</item>
<item>"*7"</item>
<item>"*8"</item>
<item>"*9"</item>
<item>"#0"</item>
<item>"#1"</item>
<item>"#2"</item>
<item>"#3"</item>
<item>"#4"</item>
<item>"#5"</item>
<item>"#6"</item>
<item>"#7"</item>
<item>"#8"</item>
<item>"#9"</item>
</string-array>
</resources>

25
core/res/res/values-mcc310-mnc410/config.xml
View File

@@ -23,31 +23,6 @@
<!-- Configure mobile network MTU. Carrier specific value is set here. <!-- Configure mobile network MTU. Carrier specific value is set here.
--> -->
<integer name="config_mobile_mtu">1410</integer> <integer name="config_mobile_mtu">1410</integer>
<!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD -->
<string-array name="config_twoDigitNumberPattern">
<item>"0"</item>
<item>"00"</item>
<item>"*0"</item>
<item>"*1"</item>
<item>"*2"</item>
<item>"*3"</item>
<item>"*4"</item>
<item>"*5"</item>
<item>"*6"</item>
<item>"*7"</item>
<item>"*8"</item>
<item>"*9"</item>
<item>"#0"</item>
<item>"#1"</item>
<item>"#2"</item>
<item>"#3"</item>
<item>"#4"</item>
<item>"#5"</item>
<item>"#6"</item>
<item>"#7"</item>
<item>"#8"</item>
<item>"#9"</item>
</string-array>
<!-- Enable 5 bar signal strength icon --> <!-- Enable 5 bar signal strength icon -->
<bool name="config_inflateSignalStrength">true</bool> <bool name="config_inflateSignalStrength">true</bool>

45
core/res/res/values-mcc313-mnc100/config.xml
View File

@@ -1,45 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2019, 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">
<string-array translatable="false" name="config_twoDigitNumberPattern">
<item>"0"</item>
<item>"00"</item>
<item>"*0"</item>
<item>"*1"</item>
<item>"*2"</item>
<item>"*3"</item>
<item>"*4"</item>
<item>"*5"</item>
<item>"*6"</item>
<item>"*7"</item>
<item>"*8"</item>
<item>"*9"</item>
<item>"#0"</item>
<item>"#1"</item>
<item>"#2"</item>
<item>"#3"</item>
<item>"#4"</item>
<item>"#5"</item>
<item>"#6"</item>
<item>"#7"</item>
<item>"#8"</item>
<item>"#9"</item>
</string-array>
</resources>

4
core/res/res/values-mcc334-mnc050/config.xml
View File

@@ -31,8 +31,4 @@
<item>9</item> <item>9</item>
</integer-array> </integer-array>
<!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD -->
<string-array translatable="false" name="config_twoDigitNumberPattern">
<item>"#9"</item>
</string-array>
</resources> </resources>

28
core/res/res/values-mcc334-mnc090/config.xml
View File

@@ -1,28 +0,0 @@
<?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 my 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.
*/
-->
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD -->
<string-array translatable="false" name="config_twoDigitNumberPattern">
<item>"#9"</item>
</string-array>
</resources>

27
core/res/res/values-mcc704-mnc01/config.xml
View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2016, 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 my 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>
<!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD -->
<string-array name="config_twoDigitNumberPattern">
<item>"*1"</item>
<item>"*5"</item>
<item>"*9"</item>
</string-array>
</resources>

27
core/res/res/values-mcc708-mnc001/config.xml
View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2016, 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 my 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.
*/
-->
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
<string-array translatable="false" name="config_twoDigitNumberPattern">
<item>"*1"</item>
<item>"*5"</item>
</string-array>
</resources>

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

@@ -2024,7 +2024,10 @@
a keyboard is present. --> a keyboard is present. -->
<bool name="config_showMenuShortcutsWhenKeyboardPresent">false</bool> <bool name="config_showMenuShortcutsWhenKeyboardPresent">false</bool>
<!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD --> <!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD.
Note: This config is deprecated, please use carrier config which is
CarrierConfigManager.KEY_MMI_TWO_DIGIT_NUMBER_PATTERN_STRING_ARRAY instead. -->
<string-array name="config_twoDigitNumberPattern" translatable="false"> <string-array name="config_twoDigitNumberPattern" translatable="false">
</string-array> </string-array>

10
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -3529,6 +3529,15 @@ public class CarrierConfigManager {
public static final String KEY_SUPPORT_WPS_OVER_IMS_BOOL = public static final String KEY_SUPPORT_WPS_OVER_IMS_BOOL =
"support_wps_over_ims_bool"; "support_wps_over_ims_bool";
/**
* The two digital number pattern of MMI code which is defined by carrier.
* If the dial number matches this pattern, it will be dialed out normally not USSD.
*
* @hide
*/
public static final String KEY_MMI_TWO_DIGIT_NUMBER_PATTERN_STRING_ARRAY =
"mmi_two_digit_number_pattern_string_array";
/** /**
* Holds the list of carrier certificate hashes. * Holds the list of carrier certificate hashes.
* Note that each carrier has its own certificates. * Note that each carrier has its own certificates.
@@ -4086,6 +4095,7 @@ public class CarrierConfigManager {
new int[] {4 /* BUSY */}); new int[] {4 /* BUSY */});
sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false); sDefaults.putBoolean(KEY_PREVENT_CLIR_ACTIVATION_AND_DEACTIVATION_CODE_BOOL, false);
sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG, 2000); sDefaults.putLong(KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG, 2000);
sDefaults.putStringArray(KEY_MMI_TWO_DIGIT_NUMBER_PATTERN_STRING_ARRAY, new String[0]);
sDefaults.putInt(KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT, sDefaults.putInt(KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT,
CellSignalStrengthLte.USE_RSRP); CellSignalStrengthLte.USE_RSRP);
// Default wifi configurations. // Default wifi configurations.