am 3450c85a: am f350afe9: am bea55afc: Merge "Telecom API council changes." into mnc-dev (366d14c9) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -30456,7 +30456,7 @@ package android.telecom {
		method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle);
		field public static final java.lang.String ACTION_CHANGE_DEFAULT_DIALER = "android.telecom.action.CHANGE_DEFAULT_DIALER";
		field public static final java.lang.String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS";
		field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.telecom.action.CONNECTION_SERVICE_CONFIGURE";
		field public static final java.lang.String ACTION_CONFIGURE_PHONE_ACCOUNT = "android.telecom.action.CONFIGURE_PHONE_ACCOUNT";
		field public static final java.lang.String ACTION_DEFAULT_DIALER_CHANGED = "android.telecom.action.DEFAULT_DIALER_CHANGED";
		field public static final java.lang.String ACTION_INCOMING_CALL = "android.telecom.action.INCOMING_CALL";
		field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS";

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -32706,7 +32706,7 @@ package android.telecom {
		method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle);
		field public static final java.lang.String ACTION_CHANGE_DEFAULT_DIALER = "android.telecom.action.CHANGE_DEFAULT_DIALER";
		field public static final java.lang.String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS";
		field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.telecom.action.CONNECTION_SERVICE_CONFIGURE";
		field public static final java.lang.String ACTION_CONFIGURE_PHONE_ACCOUNT = "android.telecom.action.CONFIGURE_PHONE_ACCOUNT";
		field public static final java.lang.String ACTION_DEFAULT_DIALER_CHANGED = "android.telecom.action.DEFAULT_DIALER_CHANGED";
		field public static final java.lang.String ACTION_INCOMING_CALL = "android.telecom.action.INCOMING_CALL";
		field public static final java.lang.String ACTION_PHONE_ACCOUNT_REGISTERED = "android.telecom.action.PHONE_ACCOUNT_REGISTERED";

telecomm/java/android/telecom/Connection.java

+34 −2

Original line number	Diff line number	Diff line
		@@ -40,7 +40,8 @@ import java.util.Set;
		import java.util.concurrent.ConcurrentHashMap;

		/**
		* Represents a connection to a remote endpoint that carries voice traffic.
		* Represents a phone call or connection to a remote endpoint that carries voice and/or video
		* traffic.
		* <p>
		* Implementations create a custom subclass of {@code Connection} and return it to the framework
		* as the return value of
		@@ -53,21 +54,52 @@ import java.util.concurrent.ConcurrentHashMap;
		*/
		public abstract class Connection extends Conferenceable {

		/**
		* The connection is initializing. This is generally the first state for a {@code Connection}
		* returned by a {@link ConnectionService}.
		*/
		public static final int STATE_INITIALIZING = 0;

		/**
		* The connection is new and not connected.
		*/
		public static final int STATE_NEW = 1;

		/**
		* An incoming connection is in the ringing state. During this state, the user's ringer or
		* vibration feature will be activated.
		*/
		public static final int STATE_RINGING = 2;

		/**
		* An outgoing connection is in the dialing state. In this state the other party has not yet
		* answered the call and the user traditionally hears a ringback tone.
		*/
		public static final int STATE_DIALING = 3;

		/**
		* A connection is active. Both parties are connected to the call and can actively communicate.
		*/
		public static final int STATE_ACTIVE = 4;

		/**
		* A connection is on hold.
		*/
		public static final int STATE_HOLDING = 5;

		/**
		* A connection has been disconnected. This is the final state once the user has been
		* disconnected from a call either locally, remotely or by an error in the service.
		*/
		public static final int STATE_DISCONNECTED = 6;

		/** Connection can currently be put on hold or unheld. */
		/**
		* Connection can currently be put on hold or unheld. This is distinct from
		* {@link #CAPABILITY_SUPPORT_HOLD} in that although a connection may support 'hold' most times,
		* it does not at the moment support the function. This can be true while the call is in the
		* state {@link #STATE_DIALING}, for example. During this condition, an in-call UI may
		* display a disabled 'hold' button.
		*/
		public static final int CAPABILITY_HOLD = 0x00000001;

		/** Connection supports the hold feature. */

telecomm/java/android/telecom/ConnectionService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -41,8 +41,8 @@ import java.util.UUID;
		import java.util.concurrent.ConcurrentHashMap;

		/**
		* {@code ConnectionService} is an abstract service that should be implemented by any app which can
		* make phone calls and want those calls to be integrated into the built-in phone app.
		* An abstract service that should be implemented by any apps which can make phone calls (VoIP or
		* otherwise) and want those calls to be integrated into the built-in phone app.
		* Once implemented, the {@code ConnectionService} needs two additional steps before it will be
		* integrated into the phone app:
		* <p>
		@@ -62,7 +62,7 @@ import java.util.concurrent.ConcurrentHashMap;
		* <br/>
		* See {@link PhoneAccount} and {@link TelecomManager#registerPhoneAccount} for more information.
		* <p>
		* Once registered and enabled by the user in the dialer settings, telecom will bind to a
		* Once registered and enabled by the user in the phone app settings, telecom will bind to a
		* {@code ConnectionService} implementation when it wants that {@code ConnectionService} to place
		* a call or the service has indicated that is has an incoming call through
		* {@link TelecomManager#addNewIncomingCall}. The {@code ConnectionService} can then expect a call

telecomm/java/android/telecom/InCallService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -248,7 +248,7 @@ public abstract class InCallService extends Service {
		}

		/**
		* Obtains the current list of {@code Call}s to be displayed by this in-call experience.
		* Obtains the current list of {@code Call}s to be displayed by this in-call service.
		*
		* @return A list of the relevant {@code Call}s.
		*/