Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0125d76f authored May 14, 2015 by Yorke Lee Committed by Android (Google) Code Review May 14, 2015

Merge "Make Conferenceable an abstract class" into mnc-dev

parents d674f230 abfcfdc0

api/current.txt

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -30051,7 +30051,7 @@ package android.telecom {
	field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5		field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5
	}		}

	public abstract class Conference implements android.telecom.Conferenceable {		public abstract class Conference extends android.telecom.Conferenceable {
	ctor public Conference(android.telecom.PhoneAccountHandle);		ctor public Conference(android.telecom.PhoneAccountHandle);
	method public final boolean addConnection(android.telecom.Connection);		method public final boolean addConnection(android.telecom.Connection);
	method public final void destroy();		method public final void destroy();
	@@ -30090,10 +30090,10 @@ package android.telecom {
	field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L		field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L
	}		}

	public abstract interface Conferenceable {		public abstract class Conferenceable {
	}		}

	public abstract class Connection implements android.telecom.Conferenceable {		public abstract class Connection extends android.telecom.Conferenceable {
	ctor public Connection();		ctor public Connection();
	method public static java.lang.String capabilitiesToString(int);		method public static java.lang.String capabilitiesToString(int);
	method public static android.telecom.Connection createCanceledConnection();		method public static android.telecom.Connection createCanceledConnection();

api/system-current.txt

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -32204,7 +32204,7 @@ package android.telecom {
	field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5		field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5
	}		}

	public abstract class Conference implements android.telecom.Conferenceable {		public abstract class Conference extends android.telecom.Conferenceable {
	ctor public Conference(android.telecom.PhoneAccountHandle);		ctor public Conference(android.telecom.PhoneAccountHandle);
	method public final boolean addConnection(android.telecom.Connection);		method public final boolean addConnection(android.telecom.Connection);
	method public final void destroy();		method public final void destroy();
	@@ -32248,10 +32248,10 @@ package android.telecom {
	field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L		field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L
	}		}

	public abstract interface Conferenceable {		public abstract class Conferenceable {
	}		}

	public abstract class Connection implements android.telecom.Conferenceable {		public abstract class Connection extends android.telecom.Conferenceable {
	ctor public Connection();		ctor public Connection();
	method public static java.lang.String capabilitiesToString(int);		method public static java.lang.String capabilitiesToString(int);
	method public static android.telecom.Connection createCanceledConnection();		method public static android.telecom.Connection createCanceledConnection();

telecomm/java/android/telecom/Conference.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
	/**		/**
	* Represents a conference call which can contain any number of {@link Connection} objects.		* Represents a conference call which can contain any number of {@link Connection} objects.
	*/		*/
	public abstract class Conference implements Conferenceable {		public abstract class Conference extends Conferenceable {

	/**		/**
	* Used to indicate that the conference connection time is not specified. If not specified,		* Used to indicate that the conference connection time is not specified. If not specified,

telecomm/java/android/telecom/Conferenceable.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,6 @@ package android.telecom;
	* call with. The {@link ConnectionService} implementation will only recognize		* call with. The {@link ConnectionService} implementation will only recognize
	* {@link Conferenceable}s which are {@link Connection}s or {@link Conference}s.		* {@link Conferenceable}s which are {@link Connection}s or {@link Conference}s.
	*/		*/
	public interface Conferenceable {		public abstract class Conferenceable {
			Conferenceable() {}
	}		}

telecomm/java/android/telecom/Connection.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -47,7 +47,7 @@ import java.util.concurrent.ConcurrentHashMap;
	* must call {@link #destroy()} to signal to the framework that the {@code Connection} is no		* must call {@link #destroy()} to signal to the framework that the {@code Connection} is no
	* longer used and associated resources may be recovered.		* longer used and associated resources may be recovered.
	*/		*/
	public abstract class Connection implements Conferenceable {		public abstract class Connection extends Conferenceable {

	public static final int STATE_INITIALIZING = 0;		public static final int STATE_INITIALIZING = 0;