From 5d2e4f20fee033a22fbadffb291c4e47f35b7633 Mon Sep 17 00:00:00 2001 From: Santos Cordon Date: Tue, 12 May 2015 12:32:51 -0700 Subject: [PATCH] Rename Connection time APIs for Conference.java Bug: 21072487 Change-Id: I7bed9957770639f2adf3c7bd31a4821c0ff0f0dd --- api/current.txt | 5 +-- api/system-current.txt | 8 ++-- telecomm/java/android/telecom/Conference.java | 43 ++++++++++++++----- 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/api/current.txt b/api/current.txt index 1b2e2e0618b26..7dc0d0b3f2b9c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30107,12 +30107,11 @@ package android.telecom { method public final void destroy(); method public final android.telecom.AudioState getAudioState(); method public final java.util.List getConferenceableConnections(); - method public final long getConnectTimeMillis(); method public final int getConnectionCapabilities(); + method public final long getConnectionTime(); method public final java.util.List getConnections(); method public final android.telecom.DisconnectCause getDisconnectCause(); method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle(); - method public android.telecom.Connection getPrimaryConnection(); method public final int getState(); method public final android.telecom.StatusHints getStatusHints(); method public android.telecom.Connection.VideoProvider getVideoProvider(); @@ -30131,8 +30130,8 @@ package android.telecom { method public final void removeConnection(android.telecom.Connection); method public final void setActive(); method public final void setConferenceableConnections(java.util.List); - method public void setConnectTimeMillis(long); method public final void setConnectionCapabilities(int); + method public final void setConnectionTime(long); method public final void setDisconnected(android.telecom.DisconnectCause); method public final void setOnHold(); method public final void setStatusHints(android.telecom.StatusHints); diff --git a/api/system-current.txt b/api/system-current.txt index fe0f87495ff5a..50dfc84c09114 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32228,12 +32228,13 @@ package android.telecom { method public final void destroy(); method public final android.telecom.AudioState getAudioState(); method public final java.util.List getConferenceableConnections(); - method public final long getConnectTimeMillis(); + method public final deprecated long getConnectTimeMillis(); method public final int getConnectionCapabilities(); + method public final long getConnectionTime(); method public final java.util.List getConnections(); method public final android.telecom.DisconnectCause getDisconnectCause(); method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle(); - method public android.telecom.Connection getPrimaryConnection(); + method public final android.telecom.Connection getPrimaryConnection(); method public final int getState(); method public final android.telecom.StatusHints getStatusHints(); method public android.telecom.Connection.VideoProvider getVideoProvider(); @@ -32252,8 +32253,9 @@ package android.telecom { method public final void removeConnection(android.telecom.Connection); method public final void setActive(); method public final void setConferenceableConnections(java.util.List); - method public void setConnectTimeMillis(long); + method public final deprecated void setConnectTimeMillis(long); method public final void setConnectionCapabilities(int); + method public final void setConnectionTime(long); method public final void setDisconnected(android.telecom.DisconnectCause); method public final void setOnHold(); method public final void setStatusHints(android.telecom.StatusHints); diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index e682697ab3389..89967d699806a 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -16,6 +16,7 @@ package android.telecom; +import android.annotation.SystemApi; import android.telecom.Connection.VideoProvider; import java.util.ArrayList; @@ -116,7 +117,7 @@ public abstract class Conference implements Conferenceable { } /** - * Returns the capabilities of a conference. See {@code CAPABILITY_*} constants in class + * Returns the capabilities of the conference. See {@code CAPABILITY_*} constants in class * {@link Connection} for valid values. * * @return A bitmask of the capabilities of the conference call. @@ -458,8 +459,10 @@ public abstract class Conference implements Conferenceable { * the connection from which the conference will retrieve its current state. * * @return The primary connection. + * @hide */ - public Connection getPrimaryConnection() { + @SystemApi + public final Connection getPrimaryConnection() { if (mUnmodifiableChildConnections == null || mUnmodifiableChildConnections.isEmpty()) { return null; } @@ -467,22 +470,42 @@ public abstract class Conference implements Conferenceable { } /** - * Sets the connect time of the {@code Conference}. - * - * @param connectTimeMillis The connection time, in milliseconds. + * @hide + * @deprecated Use {@link #setConnectionTime}. */ - public void setConnectTimeMillis(long connectTimeMillis) { - mConnectTimeMillis = connectTimeMillis; + @Deprecated + @SystemApi + public final void setConnectTimeMillis(long connectTimeMillis) { + setConnectionTime(connectTimeMillis); } /** - * Retrieves the connect time of the {@code Conference}, if specified. A value of + * Sets the connection start time of the {@code Conference}. + * + * @param connectionTimeMillis The connection time, in milliseconds. + */ + public final void setConnectionTime(long connectionTimeMillis) { + mConnectTimeMillis = connectionTimeMillis; + } + + /** + * @hide + * @deprecated Use {@link #getConnectionTime}. + */ + @Deprecated + @SystemApi + public final long getConnectTimeMillis() { + return getConnectionTime(); + } + + /** + * Retrieves the connection start time of the {@code Conference}, if specified. A value of * {@link #CONNECT_TIME_NOT_SPECIFIED} indicates that Telecom should determine the start time * of the conference. * - * @return The time the {@code Conference} has been connected. + * @return The time at which the {@code Conference} was connected. */ - public final long getConnectTimeMillis() { + public final long getConnectionTime() { return mConnectTimeMillis; }