Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Robert Greenwalt
2015-07-10 18:23:12 +00:00
committed by Android (Google) Code Review
parent 1ebcb6f8b2 4bd4389616
commit 1570b6b3c7
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/net/ConnectivityManager.java
View File

@@ -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;

3
core/java/android/net/NetworkCapabilities.java
View File

@@ -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;

3
telephony/java/com/android/internal/telephony/PhoneConstants.java
View File

@@ -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;