summaryrefslogtreecommitdiffstats
path: root/telecomm
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2014-08-08 22:13:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-07 15:31:24 +0000
commita602082fbd5bf7480015287993cabd049d29e89d (patch)
tree8692060d1a31c5f8e832a6d7ff2d85785a72a8aa /telecomm
parentc566ca54b10fca266216555c3b6fb56a5ac63343 (diff)
parente9b7a8ed8c6c69f3994d2693b1d202d926e58d2c (diff)
downloadframeworks_base-a602082fbd5bf7480015287993cabd049d29e89d.zip
frameworks_base-a602082fbd5bf7480015287993cabd049d29e89d.tar.gz
frameworks_base-a602082fbd5bf7480015287993cabd049d29e89d.tar.bz2
Merge "Better comments for the CONNECTING state." into lmp-dev
Diffstat (limited to 'telecomm')
-rw-r--r--telecomm/java/android/telecomm/Call.java4
-rw-r--r--telecomm/java/android/telecomm/CallState.java5
2 files changed, 6 insertions, 3 deletions
diff --git a/telecomm/java/android/telecomm/Call.java b/telecomm/java/android/telecomm/Call.java
index 55cb8b1..0a54c71 100644
--- a/telecomm/java/android/telecomm/Call.java
+++ b/telecomm/java/android/telecomm/Call.java
@@ -70,7 +70,9 @@ public final class Call {
public static final int STATE_PRE_DIAL_WAIT = 8;
/**
- * The state of an outgoing {@code Call}, before Telecomm broadcast intent has returned.
+ * The initial state of an outgoing {@code Call}.
+ * Common transitions are to {@link #STATE_DIALING} state for a successful call or
+ * {@link #STATE_DISCONNECTED} if it failed.
*/
public static final int STATE_CONNECTING = 9;
diff --git a/telecomm/java/android/telecomm/CallState.java b/telecomm/java/android/telecomm/CallState.java
index cfa78d4..0ca4840 100644
--- a/telecomm/java/android/telecomm/CallState.java
+++ b/telecomm/java/android/telecomm/CallState.java
@@ -32,8 +32,9 @@ public enum CallState {
NEW,
/**
- * Indicates an outgoing call has been initiated and is waiting for the broadcast intent to
- * return and provide call details before proceeding.
+ * The initial state of an outgoing {@code Call}.
+ * Common transitions are to {@link #DIALING} state for a successful call or
+ * {@link #DISCONNECTED} if it failed.
*/
CONNECTING,