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

Commit 3e0e3bc6 authored by Ram's avatar Ram Committed by Etan Cohen
Browse files

MS: Adding Support for Emergency APN in Telephony Framework 

(base/telephony)

Replacement for https://partner-android-review.googlesource.com/#/c/171175/

Change-Id: I16fc37f5c00ed79f2370bc46554fc7a24c52c4cb
Conflicts:
	core/java/android/net/ConnectivityManager.java
parent b973baca

core/java/android/net/ConnectivityManager.java

+9 −0
Original line number Diff line number Diff line
@@ -387,6 +387,12 @@ public class ConnectivityManager { 
     */

    public static final int TYPE_MOBILE_IA = 14;



/**

     * Emergency PDN connection for emergency calls

     * {@hide}

     */

    public static final int TYPE_MOBILE_EMERGENCY = 15;



    /**

     * The network that uses proxy to achieve connectivity.

     * {@hide}
@@ -490,6 +496,8 @@ public class ConnectivityManager { 
                return "WIFI_P2P";

            case TYPE_MOBILE_IA:

                return "MOBILE_IA";

            case TYPE_MOBILE_EMERGENCY:

                return "MOBILE_EMERGENCY";

            case TYPE_PROXY:

                return "PROXY";

            default:
@@ -515,6 +523,7 @@ public class ConnectivityManager { 
            case TYPE_MOBILE_IMS:

            case TYPE_MOBILE_CBS:

            case TYPE_MOBILE_IA:

            case TYPE_MOBILE_EMERGENCY:

                return true;

            default:

                return false;

core/java/android/net/MobileDataStateTracker.java

+2 −0
Original line number Diff line number Diff line
@@ -734,6 +734,8 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker { 
                return PhoneConstants.APN_TYPE_CBS;

            case ConnectivityManager.TYPE_MOBILE_IA:

                return PhoneConstants.APN_TYPE_IA;

            case ConnectivityManager.TYPE_MOBILE_EMERGENCY:

                return PhoneConstants.APN_TYPE_EMERGENCY;

            default:

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

                return null;

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ 
        <item>"mobile_cbs,12,0,2,60000,true"</item>

        <item>"wifi_p2p,13,1,0,-1,true"</item>

        <item>"mobile_ia,14,0,2,-1,true"</item>

        <item>"mobile_emergency,15,0,2,-1,true"</item>

    </string-array>



    <!-- Array of ConnectivityManager.TYPE_xxxx constants for networks that may only
@@ -204,6 +205,7 @@ 
        <item>11</item>

        <item>12</item>

        <item>14</item>

        <item>15</item>

    </integer-array>



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

services/core/java/com/android/server/ConnectivityService.java

+2 −0
Original line number Diff line number Diff line
@@ -3925,6 +3925,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                usedNetworkType = ConnectivityManager.TYPE_MOBILE_IMS;

            } else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_CBS)) {

                usedNetworkType = ConnectivityManager.TYPE_MOBILE_CBS;

            } else if (TextUtils.equals(feature, Phone.FEATURE_ENABLE_EMERGENCY)) {

                usedNetworkType = ConnectivityManager.TYPE_MOBILE_EMERGENCY;

            } else {

                Slog.e(TAG, "Can't match any mobile netTracker!");

            }

telephony/java/com/android/internal/telephony/DctConstants.java

+2 −1
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ public class DctConstants { 
    public static final int APN_FOTA_ID = 6;

    public static final int APN_CBS_ID = 7;

    public static final int APN_IA_ID = 8;

    public static final int APN_NUM_TYPES = 9;

    public static final int APN_EMERGENCY_ID = 9;

    public static final int APN_NUM_TYPES = 10;



    public static final int DISABLED = 0;

    public static final int ENABLED = 1;