summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/ConnectivityManager.java
diff options
context:
space:
mode:
authorRam <ram.pl@samsung.com>2014-06-26 11:03:44 -0700
committerEtan Cohen <etancohen@google.com>2014-07-01 02:00:51 +0000
commit3e0e3bc617c4fd0e03b88ae04a618381b20a383c (patch)
treebfd1d06fc82e7449fed5291a40900961a08e82ea /core/java/android/net/ConnectivityManager.java
parentb973baca3b6d83bb29eb468edf3dffd7d7d32e64 (diff)
downloadframeworks_base-3e0e3bc617c4fd0e03b88ae04a618381b20a383c.zip
frameworks_base-3e0e3bc617c4fd0e03b88ae04a618381b20a383c.tar.gz
frameworks_base-3e0e3bc617c4fd0e03b88ae04a618381b20a383c.tar.bz2
MS: Adding Support for Emergency APN in Telephony Framework
(base/telephony) Replacement for https://partner-android-review.googlesource.com/#/c/171175/ Change-Id: I16fc37f5c00ed79f2370bc46554fc7a24c52c4cb Conflicts: core/java/android/net/ConnectivityManager.java
Diffstat (limited to 'core/java/android/net/ConnectivityManager.java')
-rw-r--r--core/java/android/net/ConnectivityManager.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 396efff..a8b324a 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -387,6 +387,12 @@ public class ConnectivityManager {
*/
public static final int TYPE_MOBILE_IA = 14;
+/**
+ * Emergency PDN connection for emergency calls
+ * {@hide}
+ */
+ public static final int TYPE_MOBILE_EMERGENCY = 15;
+
/**
* The network that uses proxy to achieve connectivity.
* {@hide}
@@ -490,6 +496,8 @@ public class ConnectivityManager {
return "WIFI_P2P";
case TYPE_MOBILE_IA:
return "MOBILE_IA";
+ case TYPE_MOBILE_EMERGENCY:
+ return "MOBILE_EMERGENCY";
case TYPE_PROXY:
return "PROXY";
default:
@@ -515,6 +523,7 @@ public class ConnectivityManager {
case TYPE_MOBILE_IMS:
case TYPE_MOBILE_CBS:
case TYPE_MOBILE_IA:
+ case TYPE_MOBILE_EMERGENCY:
return true;
default:
return false;