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

Commit f9e43f59 authored by Phil Burk's avatar Phil Burk Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add google-owned SMS short codes for Namibia, United Arab... 

Merge "Revert "Add google-owned SMS short codes for Namibia, United Arab Emirates"" into main am: 3065779a am: 518f979e am: 400b9a56

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2828492



Change-Id: I9798237b03015d86f2523f14f583ad694d8ac3ec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ef8cae9e 400b9a56

core/res/res/xml/sms_short_codes.xml

+2 −5
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ 
         http://smscoin.net/software/engine/WordPress/Paid+SMS-registration/ -->

         http://smscoin.net/software/engine/WordPress/Paid+SMS-registration/ -->





    <!-- Arab Emirates -->

    <!-- Arab Emirates -->

    <shortcode country="ae" pattern="\\d{1,5}" free="1017|1355|3214|6253" />

    <shortcode country="ae" pattern="\\d{1,5}" free="1017|1355|3214" />





    <!-- Albania: 5 digits, known short codes listed -->

    <!-- Albania: 5 digits, known short codes listed -->

    <shortcode country="al" pattern="\\d{5}" premium="15191|55[56]00" />

    <shortcode country="al" pattern="\\d{5}" premium="15191|55[56]00" />
@@ -155,7 +155,7 @@ 
    <shortcode country="ie" pattern="\\d{5}" premium="5[3-9]\\d{3}" free="50\\d{3}|116\\d{3}" standard="5[12]\\d{3}" />

    <shortcode country="ie" pattern="\\d{5}" premium="5[3-9]\\d{3}" free="50\\d{3}|116\\d{3}" standard="5[12]\\d{3}" />





    <!-- Israel: 4 digits, known premium codes listed -->

    <!-- Israel: 4 digits, known premium codes listed -->

    <shortcode country="il" pattern="\\d{1,5}" premium="4422|4545"  free="37477" />

    <shortcode country="il" pattern="\\d{4}" premium="4422|4545" />





    <!-- Italy: 5 digits (premium=41xxx,42xxx), plus EU:

    <!-- Italy: 5 digits (premium=41xxx,42xxx), plus EU:

         https://www.itu.int/dms_pub/itu-t/oth/02/02/T020200006B0001PDFE.pdf -->

         https://www.itu.int/dms_pub/itu-t/oth/02/02/T020200006B0001PDFE.pdf -->
@@ -198,9 +198,6 @@ 
    <!-- Malaysia: 5 digits: http://www.skmm.gov.my/attachment/Consumer_Regulation/Mobile_Content_Services_FAQs.pdf -->

    <!-- Malaysia: 5 digits: http://www.skmm.gov.my/attachment/Consumer_Regulation/Mobile_Content_Services_FAQs.pdf -->

    <shortcode country="my" pattern="\\d{5}" premium="32298|33776" free="22099|28288|66668" />

    <shortcode country="my" pattern="\\d{5}" premium="32298|33776" free="22099|28288|66668" />





    <!-- Namibia: 5 digits -->

    <shortcode country="na" pattern="\\d{1,5}" free="40005" />



    <!-- The Netherlands, 4 digits, known premium codes listed, plus EU -->

    <!-- The Netherlands, 4 digits, known premium codes listed, plus EU -->

    <shortcode country="nl" pattern="\\d{4}" premium="4466|5040" free="116\\d{3}|2223|6225|2223|1662" />

    <shortcode country="nl" pattern="\\d{4}" premium="4466|5040" free="116\\d{3}|2223|6225|2223|1662" />