summaryrefslogtreecommitdiffstats
path: root/telephony/java/com/android/internal/telephony
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-07-02 14:48:38 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-02 14:48:38 -0700
commit3cd92d8faa9fd345d5bfc0d794e28449d4f6c810 (patch)
tree3288164b727c42f9c4755f237dc53975faa6e65b /telephony/java/com/android/internal/telephony
parentdf0dded1e74e7394b79b03327dcec8a0b565838e (diff)
parent53149fd1eb5c7dc0d2d3a00b72c4ebf986b4e36f (diff)
downloadframeworks_base-3cd92d8faa9fd345d5bfc0d794e28449d4f6c810.zip
frameworks_base-3cd92d8faa9fd345d5bfc0d794e28449d4f6c810.tar.gz
frameworks_base-3cd92d8faa9fd345d5bfc0d794e28449d4f6c810.tar.bz2
Merge "Fix a bad comment. - DO NOT MERGE" into jb-dev-plus-aosp
Diffstat (limited to 'telephony/java/com/android/internal/telephony')
-rw-r--r--telephony/java/com/android/internal/telephony/TelephonyCapabilities.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/TelephonyCapabilities.java b/telephony/java/com/android/internal/telephony/TelephonyCapabilities.java
index 68db60b..a122e68 100644
--- a/telephony/java/com/android/internal/telephony/TelephonyCapabilities.java
+++ b/telephony/java/com/android/internal/telephony/TelephonyCapabilities.java
@@ -180,7 +180,7 @@ public class TelephonyCapabilities {
/**
* Returns true if the device can distinguish the phone's dialing state
- * (Call.State.DIALING/ACTIVE) and connected state (Call.State.CONNECTED).
+ * (Call.State.DIALING/ALERTING) and connected state (Call.State.ACTIVE).
*
* Currently this returns true for GSM phones as we cannot know when a CDMA
* phone has transitioned from dialing/active to connected.