From b1f7f75874d433b42ee6e4171b0ad6672717edc7 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Thu, 9 Jul 2015 14:49:35 -0700 Subject: [PATCH] Enable EMERGENCY mobile connections. Hooks the ConnectivityManager.TYPE_MOBILE_EMERGENCY, PhoneConstants.APN_TYPE_EMERGENCY, and NetworkCapabilities.NET_CAPABILITY_EIMS together so carrier apps can request connections to this APN. bug:21785357 Change-Id: Id92a5e28d19407cc7a8f8b5478b23457f2f7f89d --- core/java/android/net/ConnectivityManager.java | 3 ++- core/java/android/net/NetworkCapabilities.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 12cd5f1721..e84861186f 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -432,7 +432,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 658051c9eb..514d24abc5 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;