am 66f59dc1: am 4ab39690: Merge "Enable EMERGENCY mobile connections." into mnc-dev

* commit '66f59dc1bde15be207d49fafb97db372cb01d977':
  Enable EMERGENCY mobile connections.
This commit is contained in:
Robert Greenwalt
2015-07-10 19:22:59 +00:00
committed by Android Git Automerger
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

@@ -132,7 +132,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;