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

Merge "Change Czech Republic to Czechia" am: 027a67062e

Browse Source 
am: 14bcec27a0

Change-Id: Ia8b2bcf8d01aaad715f2bd4051fc7dc011735569
This commit is contained in:
Joachim Sauer
2017-03-15 12:02:27 +00:00
committed by android-build-merger
parent 663269bae2 14bcec27a0
commit 9b30497243
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/locale_config.xml
View File

@@ -75,7 +75,7 @@
<item>ce-RU</item> <!-- Chechen (Russia) --> <item>ce-RU</item> <!-- Chechen (Russia) -->
<item>cgg-UG</item> <!-- Chiga (Uganda) --> <item>cgg-UG</item> <!-- Chiga (Uganda) -->
<item>chr-US</item> <!-- Cherokee (United States) --> <item>chr-US</item> <!-- Cherokee (United States) -->
<item>cs-CZ</item> <!-- Czech (Czech Republic) --> <item>cs-CZ</item> <!-- Czech (Czechia) -->
<item>cy-GB</item> <!-- Welsh (United Kingdom) --> <item>cy-GB</item> <!-- Welsh (United Kingdom) -->
<item>da-DK</item> <!-- Danish (Denmark) --> <item>da-DK</item> <!-- Danish (Denmark) -->
<item>da-GL</item> <!-- Danish (Greenland) --> <item>da-GL</item> <!-- Danish (Greenland) -->

2
core/res/res/xml/sms_short_codes.xml
View File

@@ -79,7 +79,7 @@
<!-- Cyprus: 4-6 digits (not confirmed), known premium codes listed, plus EU --> <!-- Cyprus: 4-6 digits (not confirmed), known premium codes listed, plus EU -->
<shortcode country="cy" pattern="\\d{4,6}" premium="7510" free="116\\d{3}" /> <shortcode country="cy" pattern="\\d{4,6}" premium="7510" free="116\\d{3}" />
<!-- Czech Republic: 7-8 digits, starting with 9, plus EU: <!-- Czechia: 7-8 digits, starting with 9, plus EU:
http://www.o2.cz/osobni/en/services-by-alphabet/91670-premium_sms.html --> http://www.o2.cz/osobni/en/services-by-alphabet/91670-premium_sms.html -->
<shortcode country="cz" premium="9\\d{6,7}" free="116\\d{3}" /> <shortcode country="cz" premium="9\\d{6,7}" free="116\\d{3}" />

2
telephony/java/android/telephony/PhoneNumberUtils.java
View File

@@ -1620,7 +1620,7 @@ public class PhoneNumberUtils
// //
// Australia: Short codes are six or eight digits in length, starting with the prefix "19" // Australia: Short codes are six or eight digits in length, starting with the prefix "19"
// followed by an additional four or six digits and two. // followed by an additional four or six digits and two.
// Czech Republic: Codes are seven digits in length for MO and five (not billed) or // Czechia: Codes are seven digits in length for MO and five (not billed) or
// eight (billed) for MT direction // eight (billed) for MT direction
// //
// see http://en.wikipedia.org/wiki/Short_code#Regional_differences for reference // see http://en.wikipedia.org/wiki/Short_code#Regional_differences for reference