diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-07-10 18:38:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-10 18:38:22 +0000 |
| commit | 66f59dc1bde15be207d49fafb97db372cb01d977 (patch) | |
| tree | 9722a56f3724f81f185172806214a32648e37671 | |
| parent | d30a3d6693da16cf2daef05847ddaa4ae7453e83 (diff) | |
| parent | 1570b6b3c7d1d41a52555312d161d0afe4b81df3 (diff) | |
| download | frameworks_base-66f59dc1bde15be207d49fafb97db372cb01d977.zip frameworks_base-66f59dc1bde15be207d49fafb97db372cb01d977.tar.gz frameworks_base-66f59dc1bde15be207d49fafb97db372cb01d977.tar.bz2 | |
am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev
* commit '1570b6b3c7d1d41a52555312d161d0afe4b81df3':
Enable EMERGENCY mobile connections.
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 3 | ||||
| -rw-r--r-- | core/java/android/net/NetworkCapabilities.java | 3 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/PhoneConstants.java | 3 |
3 files changed, 6 insertions, 3 deletions
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 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; 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 @@ 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; diff --git a/telephony/java/com/android/internal/telephony/PhoneConstants.java b/telephony/java/com/android/internal/telephony/PhoneConstants.java index 2a4032c..572cc6f 100644 --- a/telephony/java/com/android/internal/telephony/PhoneConstants.java +++ b/telephony/java/com/android/internal/telephony/PhoneConstants.java @@ -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; |