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

This commit is contained in:
Robert Greenwalt
2015-07-10 18:23:12 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 2 deletions

View File

@@ -431,7 +431,8 @@ public class ConnectivityManager {
public static final int TYPE_MOBILE_IA = 14; 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} * {@hide}
*/ */
public static final int TYPE_MOBILE_EMERGENCY = 15; public static final int TYPE_MOBILE_EMERGENCY = 15;

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 * 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; public static final int NET_CAPABILITY_EIMS = 10;