commit 99959f18e41970e97d1f46e50965c712bc767157
author Robert Greenwalt <rgreenwalt@google.com> Fri Jul 10 18:23:12 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 10 18:23:24 2015 +0000
tree 7f31a797bb05c87fc099a0856674acdd6379b96e
parent 823ea71ef3d32ecb0ea469a62c44682210770d2d
parent 9db5f3c1ccd98a1ca1725260808dcdca8d13afa7

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

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index de7ca0c..dc8ff8f 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -431,7 +431,8 @@
     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

diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java
index 658051c..514d24a 100644
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -133,7 +133,8 @@
 
     /**
      * 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;