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

Commit 9d7d6280 authored by Wink Saville's avatar Wink Saville
Browse files

Do not merge: Revert the revert of "LTE Changes for Telephony including... 

Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"

This reverts commit eca208fa
and is the first of the LTE commits in master being back ported
to the LTE branch.

Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
parent 2d24213f

core/java/android/net/ConnectivityManager.java

+24 −4
Original line number Diff line number Diff line
@@ -221,12 +221,32 @@ public class ConnectivityManager 


    /** {@hide} */

    public static final int TYPE_DUMMY       = 8;



    /** {@hide} */

    public static final int TYPE_ETHERNET    = 9;

    /** {@hide} TODO: Need to adjust this for WiMAX. */

    public static final int MAX_RADIO_TYPE   = TYPE_DUMMY;

    /** {@hide} TODO: Need to adjust this for WiMAX. */

    public static final int MAX_NETWORK_TYPE = TYPE_DUMMY;

    /**

     * Over the air Adminstration.

     * {@hide}

     */

    public static final int TYPE_MOBILE_FOTA = 10;



    /**

     * IP Multimedia Subsystem

     * {@hide}

     */

    public static final int TYPE_MOBILE_IMS  = 11;



    /**

     * Carrier Branded Services

     * {@hide}

     */

    public static final int TYPE_MOBILE_CBS  = 12;



    /** {@hide} */

    public static final int MAX_RADIO_TYPE   = TYPE_MOBILE_CBS;



    /** {@hide} */

    public static final int MAX_NETWORK_TYPE = TYPE_MOBILE_CBS;



    public static final int DEFAULT_NETWORK_PREFERENCE = TYPE_WIFI;

core/java/android/net/MobileDataStateTracker.java

+8 −1
Original line number Diff line number Diff line
@@ -437,7 +437,8 @@ public class MobileDataStateTracker implements NetworkStateTracker { 
                retValue = true;

                break;

            case Phone.APN_REQUEST_STARTED:

                // no need to do anything - we're already due some status update intents

                // set IDLE here , avoid the following second FAILED not sent out

                mNetworkInfo.setDetailedState(DetailedState.IDLE, null, null);

                retValue = true;

                break;

            case Phone.APN_REQUEST_FAILED:
@@ -546,6 +547,12 @@ public class MobileDataStateTracker implements NetworkStateTracker { 
                return Phone.APN_TYPE_DUN;

            case ConnectivityManager.TYPE_MOBILE_HIPRI:

                return Phone.APN_TYPE_HIPRI;

            case ConnectivityManager.TYPE_MOBILE_FOTA:

                return Phone.APN_TYPE_FOTA;

            case ConnectivityManager.TYPE_MOBILE_IMS:

                return Phone.APN_TYPE_IMS;

            case ConnectivityManager.TYPE_MOBILE_CBS:

                return Phone.APN_TYPE_CBS;

            default:

                sloge("Error mapping networkType " + netType + " to apnType.");

                return null;

core/java/android/provider/Telephony.java

+8 −0
Original line number Diff line number Diff line
@@ -1723,6 +1723,14 @@ public final class Telephony { 


        public static final String TYPE = "type";



        public static final String INACTIVE_TIMER = "inactivetimer";



        // Only if enabled try Data Connection.

        public static final String ENABLED = "enabled";



        // Rules apply based on class.

        public static final String CLASS = "class";



        /**

         * The protocol to be used to connect to this APN.

         *

core/res/res/values/config.xml

+8 −0
Original line number Diff line number Diff line
@@ -52,6 +52,11 @@ 
         strictly needed. -->

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



    <!-- Default value used to block data calls if ims is not

         connected.  If you use the ims apn DCT will block

         any other apn from connecting until ims apn is connected-->

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

    

    <!-- Flag indicating whether the surface flinger is inefficient

         at performing a blur.  Used by parts of the UI to turn off

         the blur effect where it isn't worth the performance hit. -->
@@ -133,6 +138,9 @@ 
        <item>"mobile_mms,2,0,2"</item>

        <item>"mobile_supl,3,0,2"</item>

        <item>"mobile_hipri,5,0,3"</item>

        <item>"mobile_fota,8,0,2"</item>

        <item>"mobile_ims,9,0,2"</item>

        <item>"mobile_cbs,10,0,2"</item>

    </string-array>



    <!-- This string array should be overridden by the device to present a list of radio

packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4g.png

0 → 100644
+258 B
Loading image diff...