Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd0f47a9 authored by Joachim Sauer's avatar Joachim Sauer Committed by android-build-merger
Browse files

Merge "Change Czech Republic to Czechia" am: 027a6706 am: 14bcec27 

am: 9b304972

Change-Id: I78d646c5052e29662f523dc4ae6ce3ecb5d4768d
parents d3b1def2 9b304972

core/res/res/values/locale_config.xml

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
        <item>ce-RU</item> <!-- Chechen (Russia) -->

        <item>cgg-UG</item> <!-- Chiga (Uganda) -->

        <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>da-DK</item> <!-- Danish (Denmark) -->

        <item>da-GL</item> <!-- Danish (Greenland) -->

core/res/res/xml/sms_short_codes.xml

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
    <!-- 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}" />



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

    <shortcode country="cz" premium="9\\d{6,7}" free="116\\d{3}" />

telephony/java/android/telephony/PhoneNumberUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -1620,7 +1620,7 @@ public class PhoneNumberUtils 
    //

    // 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.

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

    //

    // see http://en.wikipedia.org/wiki/Short_code#Regional_differences for reference