Merge "Rename Connection time APIs for Conference.java" into mnc-dev (3aea94ff) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −3

Original line number	Diff line number	Diff line
		@@ -30061,12 +30061,11 @@ package android.telecom {
		method public final void destroy();
		method public final android.telecom.AudioState getAudioState();
		method public final java.util.List<android.telecom.Connection> getConferenceableConnections();
		method public final long getConnectTimeMillis();
		method public final int getConnectionCapabilities();
		method public final long getConnectionTime();
		method public final java.util.List<android.telecom.Connection> 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();
		@@ -30085,8 +30084,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<android.telecom.Connection>);
		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);

api/system-current.txt

+5 −3

Original line number	Diff line number	Diff line
		@@ -32191,12 +32191,13 @@ package android.telecom {
		method public final void destroy();
		method public final android.telecom.AudioState getAudioState();
		method public final java.util.List<android.telecom.Connection> 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<android.telecom.Connection> 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();
		@@ -32215,8 +32216,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<android.telecom.Connection>);
		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);

telecomm/java/android/telecom/Conference.java

+31 −8

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.telecom;

		import android.annotation.SystemApi;
		import android.telecom.Connection.VideoProvider;

		import java.util.ArrayList;
		@@ -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}.
		* @hide
		* @deprecated Use {@link #setConnectionTime}.
		*/
		@Deprecated
		@SystemApi
		public final void setConnectTimeMillis(long connectTimeMillis) {
		setConnectionTime(connectTimeMillis);
		}

		/**
		* Sets the connection start time of the {@code Conference}.
		*
		* @param connectTimeMillis The connection time, in milliseconds.
		* @param connectionTimeMillis The connection time, in milliseconds.
		*/
		public void setConnectTimeMillis(long connectTimeMillis) {
		mConnectTimeMillis = connectTimeMillis;
		public final void setConnectionTime(long connectionTimeMillis) {
		mConnectTimeMillis = connectionTimeMillis;
		}

		/**
		* Retrieves the connect time of the {@code Conference}, if specified. A value of
		* @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;
		}