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

Commit 1570b6b3 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Enable EMERGENCY mobile connections." into mnc-dev

parents 1ebcb6f8 4bd43896

core/java/android/net/ConnectivityManager.java

+2 −1
Original line number Diff line number Diff line
@@ -431,7 +431,8 @@ public class ConnectivityManager { 
    public static final int TYPE_MOBILE_IA = 14;



    /**

     * Emergency PDN connection for emergency calls

     * Emergency PDN connection for emergency services.  This

     * may include IMS and MMS in emergency situations.

     * {@hide}

     */

    public static final int TYPE_MOBILE_EMERGENCY = 15;

core/java/android/net/NetworkCapabilities.java

+2 −1
Original line number Diff line number Diff line
@@ -133,7 +133,8 @@ public final class NetworkCapabilities implements Parcelable { 


    /**

     * Indicates this is a network that has the ability to reach a carrier's

     * Emergency IMS servers, used for network signaling during emergency calls.

     * Emergency IMS servers or other services, used for network signaling

     * during emergency calls.

     */

    public static final int NET_CAPABILITY_EIMS           = 10;

telephony/java/com/android/internal/telephony/PhoneConstants.java

+2 −1
Original line number Diff line number Diff line
@@ -133,7 +133,8 @@ public class PhoneConstants { 
    public static final String APN_TYPE_CBS = "cbs";

    /** APN type for IA Initial Attach APN */

    public static final String APN_TYPE_IA = "ia";

    /** APN type for IA Emergency PDN */

    /** APN type for Emergency PDN. This is not an IA apn, but is used

     * for access to carrier services in an emergency call situation. */

    public static final String APN_TYPE_EMERGENCY = "emergency";



    public static final int RIL_CARD_MAX_APPS    = 8;