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

Commit afc72f7c authored by Deepak Kundra's avatar Deepak Kundra
Browse files

Merge 'remotes/caf/m' into 'cm-13.0' 

Change-Id: I98791364677b7c0622c1ee1044838c406954398f
parents 8942ed51 99ef5303

resources/res/values-es-rUS/config.xml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (c) 2015, The Linux Foundation. All rights reserved.



Redistribution and use in source and binary forms, with or without

modification, are permitted provided that the following conditions are

met:

    * Redistributions of source code must retain the above copyright

      notice, this list of conditions and the following disclaimer.

    * Redistributions in binary form must reproduce the above

      copyright notice, this list of conditions and the following

      disclaimer in the documentation and/or other materials provided

      with the distribution.

    * Neither the name of The Linux Foundation nor the names of its

      contributors may be used to endorse or promote products derived

      from this software without specific prior written permission.



THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds.  Do not translate. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- pdp data reject dialog string for cause 29 and 33 -->

    <string name="data_conn_status_title" translatable="false"></string>

    <string name="user_authentication_failed" translatable="false"></string>

    <string name="service_not_subscribed" translatable="false"></string>

</resources>

resources/res/values-pt-rPT/config.xml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (c) 2015, The Linux Foundation. All rights reserved.



Redistribution and use in source and binary forms, with or without

modification, are permitted provided that the following conditions are

met:

    * Redistributions of source code must retain the above copyright

      notice, this list of conditions and the following disclaimer.

    * Redistributions in binary form must reproduce the above

      copyright notice, this list of conditions and the following

      disclaimer in the documentation and/or other materials provided

      with the distribution.

    * Neither the name of The Linux Foundation nor the names of its

      contributors may be used to endorse or promote products derived

      from this software without specific prior written permission.



THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds.  Do not translate. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- SDN related strings -->

    <string name="sdn" translatable="false"></string>

    <string name="summary_sdn" translatable="false"></string>

</resources>

resources/res/values/config.xml

+24 −0
Original line number Diff line number Diff line
@@ -48,4 +48,28 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
    <string name="telephony_plugin_jar_name" translatable="false"></string>

    <!--Fully qualified class name of telephony extended plugin.-->

    <string name="telephony_plugin_class_name" translatable="false"></string>

    <!-- When set to true, this config enables reading and displaying

         the contents of EF_SDN present in SIM -->

    <bool name="config_enable_displaying_sdn">false</bool>

    <!-- config for showing dial option when fdn contact is selected.

         By default feature is disabled -->

    <bool name="config_fdn_direct_dial">false</bool>

    <!-- FDN contact search is enabled-->

    <bool name="config_fdn_contact_search">false</bool>

    <!-- plmn name override enabled-->

    <bool name="config_plmn_name_override_enabled">false</bool>



    <string name="sdn"></string>

    <string name="summary_sdn"></string>

    <string name="launch_sdn"></string>

    <!-- pdp data retry for cause 29 and 33 is disabled-->

    <bool name="config_pdp_retry_for_29_33_enabled">false</bool>

    <!--pdp data reject retry delay can be configured here -->

    <integer name="data_retry_delay">0</integer>

    <!-- pdp data reject idle timeout delay-->

    <integer name="data_retry_idle_delay">0</integer>

    <!-- pdp data reject dialog string for cause 29 and 33 -->

    <string name="data_conn_status_title"></string>

    <string name="user_authentication_failed"></string>

    <string name="service_not_subscribed"></string>

</resources>

src/java/android/provider/Telephony.java

+37 −5
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ public final class Telephony { 
         * @hide

         */

        public static Cursor query(ContentResolver cr, String[] projection) {

            android.util.SeempLog.record(13);

            android.util.SeempLog.record(10);

            return cr.query(CONTENT_URI, projection, null, null, DEFAULT_SORT_ORDER);

        }
@@ -326,7 +326,7 @@ public final class Telephony { 
         */

        public static Cursor query(ContentResolver cr, String[] projection,

                String where, String orderBy) {

            android.util.SeempLog.record(13);

            android.util.SeempLog.record(10);

            return cr.query(CONTENT_URI, projection, where,

                    null, orderBy == null ? DEFAULT_SORT_ORDER : orderBy);

        }
@@ -2044,7 +2044,7 @@ public final class Telephony { 
         */

        public static Cursor query(

                ContentResolver cr, String[] projection) {

            android.util.SeempLog.record(13);

            android.util.SeempLog.record(10);

            return cr.query(CONTENT_URI, projection, null, null, DEFAULT_SORT_ORDER);

        }
@@ -2055,7 +2055,7 @@ public final class Telephony { 
        public static Cursor query(

                ContentResolver cr, String[] projection,

                String where, String orderBy) {

            android.util.SeempLog.record(13);

            android.util.SeempLog.record(10);

            return cr.query(CONTENT_URI, projection,

                    where, null, orderBy == null ? DEFAULT_SORT_ORDER : orderBy);

        }
@@ -2983,7 +2983,7 @@ public final class Telephony { 
         * <P>Type: INTEGER</P>

         */

        public static final String SERVICE_CATEGORY = "service_category";



        public static final String MESSAGE_DELETED = "flag_is_deleted";

        /**

         * Message language code.

         * <P>Type: TEXT</P>
@@ -3092,6 +3092,38 @@ public final class Telephony { 
        };

    }



    /**

     * @hide

     */

    public static final class CdmaCallOptions implements BaseColumns {

        /**

         * The content:// style URL for this table

         */

        public static final Uri CONTENT_URI =

                Uri.parse("content://cdma/calloption");



        /**

         * The default sort order for this table

         */

        public static final String DEFAULT_SORT_ORDER = "name ASC";



        public static final String NAME = "name";



        public static final String MCC = "mcc";



        public static final String MNC = "mnc";



        public static final String NUMERIC = "numeric";



        public static final String NUMBER = "number";



        public static final String TYPE = "type";



        public static final String CATEGORY = "category";



        public static final String STATE = "state";

    }



    /**

     * Contains phone numbers that are blacklisted

     * for phone and/or message purposes.

src/java/android/telephony/SmsManager.java

+7 −6
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ public final class SmsManager { 
    public void sendTextMessage(

            String destinationAddress, String scAddress, String text,

            PendingIntent sentIntent, PendingIntent deliveryIntent) {

        android.util.SeempLog.record(94);

        android.util.SeempLog.record_str(75, destinationAddress);

        sendTextMessageInternal(destinationAddress, scAddress, text,

            sentIntent, deliveryIntent, true /* persistMessageForCarrierApp*/);

    }
@@ -341,6 +341,7 @@ public final class SmsManager { 
    public void sendTextMessageWithSelfPermissions(

            String destinationAddress, String scAddress, String text,

            PendingIntent sentIntent, PendingIntent deliveryIntent) {

        android.util.SeempLog.record_str(75, destinationAddress);

        if (TextUtils.isEmpty(destinationAddress)) {

            throw new IllegalArgumentException("Invalid destinationAddress");

        }
@@ -525,7 +526,6 @@ public final class SmsManager { 
    public void sendMultipartTextMessage(

            String destinationAddress, String scAddress, ArrayList<String> parts,

            ArrayList<PendingIntent> sentIntents, ArrayList<PendingIntent> deliveryIntents) {

        android.util.SeempLog.record(96);

        sendMultipartTextMessageInternal(destinationAddress, scAddress, parts,

              sentIntents, deliveryIntents, true /* persistMessageForCarrierApp*/);

    }
@@ -709,7 +709,7 @@ public final class SmsManager { 
    public void sendDataMessage(

            String destinationAddress, String scAddress, short destinationPort,

            byte[] data, PendingIntent sentIntent, PendingIntent deliveryIntent) {

        android.util.SeempLog.record(92);

        android.util.SeempLog.record_str(73, destinationAddress);

        if (TextUtils.isEmpty(destinationAddress)) {

            throw new IllegalArgumentException("Invalid destinationAddress");

        }
@@ -737,6 +737,7 @@ public final class SmsManager { 
    public void sendDataMessageWithSelfPermissions(

            String destinationAddress, String scAddress, short destinationPort,

            byte[] data, PendingIntent sentIntent, PendingIntent deliveryIntent) {

        android.util.SeempLog.record_str(73, destinationAddress);

        if (TextUtils.isEmpty(destinationAddress)) {

            throw new IllegalArgumentException("Invalid destinationAddress");

        }
@@ -870,7 +871,7 @@ public final class SmsManager { 
     * {@hide}

     */

    public boolean copyMessageToIcc(byte[] smsc, byte[] pdu,int status) {

        android.util.SeempLog.record(98);

        android.util.SeempLog.record(79);

        boolean success = false;



        if (null == pdu) {
@@ -902,7 +903,7 @@ public final class SmsManager { 
     */

    public boolean

    deleteMessageFromIcc(int messageIndex) {

        android.util.SeempLog.record(99);

        android.util.SeempLog.record(80);

        boolean success = false;

        byte[] pdu = new byte[IccConstants.SMS_RECORD_LENGTH-1];

        Arrays.fill(pdu, (byte)0xff);
@@ -936,7 +937,7 @@ public final class SmsManager { 
     * {@hide}

     */

    public boolean updateMessageOnIcc(int messageIndex, int newStatus, byte[] pdu) {

        android.util.SeempLog.record(100);

        android.util.SeempLog.record(81);

        boolean success = false;



        try {