summaryrefslogtreecommitdiff
path: root/telecomm/java/android/telecom/Conference.java
diff options
context:
space:
mode:
authorGrace Jia <xiaotonj@google.com>2021-01-19 13:57:51 -0800
committerGrace Jia <xiaotonj@google.com>2021-01-20 14:21:04 -0800
commit41895157db970a3e7cabe922414c8fa0900817b8 (patch)
tree23a6f688780ba0e00d18c44bbc08e754fd1de91d /telecomm/java/android/telecom/Conference.java
parent942b71b485932b19c58cfc939c1ffce2977b4084 (diff)
Annotation and doc improvement for adhoc conference APIs.
Annotate Conference#onAnswer with @VideoState Mark parameters of adhoc conference APIs with @NonNull. Document the distinction between returning null and returning a failed conference. Bug: 165801368 Test: make Change-Id: Ic0bd1a1e431ca0dec52afc8a28996929684236ba
Diffstat (limited to 'telecomm/java/android/telecom/Conference.java')
-rw-r--r--telecomm/java/android/telecom/Conference.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java
index dc2fb948fdbe..f84dd7b0bb17 100644
--- a/telecomm/java/android/telecom/Conference.java
+++ b/telecomm/java/android/telecom/Conference.java
@@ -338,7 +338,7 @@ public abstract class Conference extends Conferenceable {
*
* @param videoState The video state in which to answer the connection.
*/
- public void onAnswer(int videoState) {}
+ public void onAnswer(@VideoProfile.VideoState int videoState) {}
/**
* Notifies this Conference, which is in {@code STATE_RINGING}, of