diff options
author | Grace Jia <xiaotonj@google.com> | 2020-07-10 15:42:32 -0700 |
---|---|---|
committer | Grace Jia <xiaotonj@google.com> | 2020-07-27 11:18:36 -0700 |
commit | 8587ee5cd52bf3fac714073cc926bd560e2f07ba (patch) | |
tree | 94593f034cc225cef3f076b18e41418588aeb566 /telecomm/java/android/telecom/Connection.java | |
parent | 2ca1abc174209b5b4b1e2599133045ed6249f0b7 (diff) |
Expose adhoc conference calling API as public.
Bug: 159944852
Test: make
Change-Id: I2cf39a6fd8a02ca4f2d0c83c484ab12bb13f74c3
Diffstat (limited to 'telecomm/java/android/telecom/Connection.java')
-rwxr-xr-x | telecomm/java/android/telecom/Connection.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 9dfa3ac7a5d8..b35452146e72 100755 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -383,8 +383,10 @@ public abstract class Connection extends Conferenceable { /** * When set, indicates that this {@link Connection} supports initiation of a conference call - * by directly adding participants using {@link #onAddConferenceParticipants(List)}. - * @hide + * by directly adding participants using {@link #onAddConferenceParticipants(List)}. When + * participants are added to a {@link Connection}, it will be replaced by a {@link Conference} + * instance with {@link #PROPERTY_IS_ADHOC_CONFERENCE} set to indicate that it is an adhoc + * conference call. */ public static final int CAPABILITY_ADD_PARTICIPANT = 0x04000000; @@ -526,10 +528,9 @@ public abstract class Connection extends Conferenceable { public static final int PROPERTY_REMOTELY_HOSTED = 1 << 11; /** - * Set by the framework to indicate that it is an adhoc conference call. + * Set by the framework to indicate that a call is an adhoc conference call. * <p> - * This is used for Outgoing and incoming conference calls. - * @hide + * This is used for outgoing and incoming conference calls. */ public static final int PROPERTY_IS_ADHOC_CONFERENCE = 1 << 12; @@ -3009,7 +3010,6 @@ public abstract class Connection extends Conferenceable { * Supports initiation of a conference call by directly adding participants to an ongoing call. * * @param participants with which conference call will be formed. - * @hide */ public void onAddConferenceParticipants(@NonNull List<Uri> participants) {} |