summaryrefslogtreecommitdiffstats
path: root/telephony/java/com
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2015-07-10 18:38:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-10 18:38:22 +0000
commit66f59dc1bde15be207d49fafb97db372cb01d977 (patch)
tree9722a56f3724f81f185172806214a32648e37671 /telephony/java/com
parentd30a3d6693da16cf2daef05847ddaa4ae7453e83 (diff)
parent1570b6b3c7d1d41a52555312d161d0afe4b81df3 (diff)
downloadframeworks_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.
Diffstat (limited to 'telephony/java/com')
-rw-r--r--telephony/java/com/android/internal/telephony/PhoneConstants.java3
1 files changed, 2 insertions, 1 deletions
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;