Merge "Change incoming call intent to a TelecommManager method. (1/3)" into lmp-dev (40075c7c) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −2

Original line number	Diff line number	Diff line
		@@ -28712,6 +28712,7 @@ package android.telecomm {
		}

		public class TelecommManager {
		method public void addNewIncomingCall(android.telecomm.PhoneAccountHandle, android.os.Bundle);
		method public void clearAccounts(java.lang.String);
		method public android.telecomm.PhoneAccountHandle getDefaultOutgoingPhoneAccount();
		method public java.util.List<android.telecomm.PhoneAccountHandle> getEnabledPhoneAccounts();
		@@ -28720,14 +28721,12 @@ package android.telecomm {
		method public void unregisterPhoneAccount(android.telecomm.PhoneAccountHandle);
		field public static final java.lang.String ACTION_CONNECTION_SERVICE;
		field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.intent.action.CONNECTION_SERVICE_CONFIGURE";
		field public static final java.lang.String ACTION_INCOMING_CALL = "android.intent.action.INCOMING_CALL";
		field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ','
		field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';'
		field public static final java.lang.String EXTRA_CALL_BACK_NUMBER = "android.telecomm.extra.CALL_BACK_NUMBER";
		field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecomm.extra.CALL_DISCONNECT_CAUSE";
		field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecomm.extra.CALL_DISCONNECT_MESSAGE";
		field public static final java.lang.String EXTRA_CONNECTION_SERVICE = "android.telecomm.extra.CONNECTION_SERVICE";
		field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.intent.extra.INCOMING_CALL_EXTRAS";
		field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.intent.extra.PHONE_ACCOUNT_HANDLE";
		field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.intent.extra.START_CALL_WITH_SPEAKERPHONE";
		field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.intent.extra.START_CALL_WITH_VIDEO_STATE";

telecomm/java/android/telecomm/TelecommManager.java

+75 −53

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@ package android.telecomm;
		import android.annotation.SystemApi;
		import android.content.ComponentName;
		import android.content.Context;

		import android.os.Bundle;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.util.Log;
		@@ -27,23 +29,22 @@ import java.util.List;

		/**
		* Provides access to Telecomm-related functionality.
		* TODO(santoscordon): Move this all into PhoneManager.
		* TODO: Move this all into PhoneManager.
		*/
		public class TelecommManager {

		/**
		* <p>Activity action: Starts the UI for handing an incoming call. This intent starts the
		* in-call UI by notifying the Telecomm system that an incoming call exists for a specific call
		* service (see {@link ConnectionService}). Telecomm reads the Intent extras
		* to find and bind to the appropriate {@link ConnectionService} which
		* Telecomm will ultimately use to control and get information about the call.</p>
		*
		* <p>Input: get*Extra field {@link #EXTRA_PHONE_ACCOUNT_HANDLE} contains the component name of the
		* {@link ConnectionService} that Telecomm should bind to. Telecomm will then
		* Activity action: Starts the UI for handing an incoming call. This intent starts the in-call
		* UI by notifying the Telecomm system that an incoming call exists for a specific call service
		* (see {@link android.telecomm.ConnectionService}). Telecomm reads the Intent extras to find
		* and bind to the appropriate {@link android.telecomm.ConnectionService} which Telecomm will
		* ultimately use to control and get information about the call.
		* <p>
		* Input: get*Extra field {@link #EXTRA_PHONE_ACCOUNT_HANDLE} contains the component name of the
		* {@link android.telecomm.ConnectionService} that Telecomm should bind to. Telecomm will then
		* ask the connection service for more information about the call prior to showing any UI.
		*
		* TODO(santoscordon): Needs permissions.
		* TODO(santoscordon): Consider moving this into a simple method call on a system service.
		* @hide
		*/
		public static final String ACTION_INCOMING_CALL = "android.intent.action.INCOMING_CALL";

		@@ -70,7 +71,8 @@ public class TelecommManager {
		/**
		* Optional extra for {@link android.content.Intent#ACTION_CALL} containing an integer that
		* determines the desired video state for an outgoing call.
		* Valid options: {@link android.telecomm.VideoCallProfile#VIDEO_STATE_AUDIO_ONLY},
		* Valid options:
		* {@link android.telecomm.VideoCallProfile#VIDEO_STATE_AUDIO_ONLY},
		* {@link android.telecomm.VideoCallProfile#VIDEO_STATE_BIDIRECTIONAL},
		* {@link android.telecomm.VideoCallProfile#VIDEO_STATE_RX_ENABLED},
		* {@link android.telecomm.VideoCallProfile#VIDEO_STATE_TX_ENABLED}.
		@@ -79,21 +81,21 @@ public class TelecommManager {
		"android.intent.extra.START_CALL_WITH_VIDEO_STATE";

		/**
		* The extra used with an {@link android.content.Intent#ACTION_CALL},
		* {@link #ACTION_INCOMING_CALL}, {@link android.content.Intent#ACTION_DIAL} {@code Intent} to
		* specify a {@link PhoneAccountHandle} to use when making the call.
		*
		* The extra used with an {@link android.content.Intent#ACTION_CALL} and
		* {@link android.content.Intent#ACTION_DIAL} {@code Intent} to specify a
		* {@link PhoneAccountHandle} to use when making the call.
		* <p class="note">
		* Retrieve with
		* {@link android.content.Intent#getParcelableExtra(String)}.
		* Retrieve with {@link android.content.Intent#getParcelableExtra(String)}.
		*/
		public static final String EXTRA_PHONE_ACCOUNT_HANDLE =
		"android.intent.extra.PHONE_ACCOUNT_HANDLE";

		/**
		* Optional extra for {@link #ACTION_INCOMING_CALL} containing a {@link android.os.Bundle}
		* which contains metadata about the call. This {@link android.os.Bundle} will be returned to
		* the {@link android.telecomm.ConnectionService}.
		* Optional extra for {@link #ACTION_INCOMING_CALL} containing a {@link Bundle} which contains
		* metadata about the call. This {@link Bundle} will be returned to the
		* {@link ConnectionService}.
		*
		* @hide
		*/
		public static final String EXTRA_INCOMING_CALL_EXTRAS =
		"android.intent.extra.INCOMING_CALL_EXTRAS";
		@@ -123,10 +125,9 @@ public class TelecommManager {
		* The number which the party on the other side of the line will see (and use to return the
		* call).
		* <p>
		* {@link ConnectionService}s which interact with
		* {@link RemoteConnection}s should only populate this if the
		* {@link android.telephony.TelephonyManager#getLine1Number()} value, as that is the user's
		* expected caller ID.
		* {@link ConnectionService}s which interact with {@link RemoteConnection}s should only populate
		* this if the {@link android.telephony.TelephonyManager#getLine1Number()} value, as that is the
		* user's expected caller ID.
		*/
		public static final String EXTRA_CALL_BACK_NUMBER = "android.telecomm.extra.CALL_BACK_NUMBER";

		@@ -178,8 +179,8 @@ public class TelecommManager {
		/**
		* Broadcast intent action indicating that the current TTY mode has changed. An intent extra
		* provides this state as an int.
		* @see #EXTRA_CURRENT_TTY_MODE
		*
		* @see #EXTRA_CURRENT_TTY_MODE
		* @hide
		*/
		public static final String ACTION_CURRENT_TTY_MODE_CHANGED =
		@@ -199,22 +200,19 @@ public class TelecommManager {
		"android.telecomm.intent.extra.CURRENT_TTY_MODE";

		/**
		* Broadcast intent action indicating that the TTY preferred operating mode
		* has changed. An intent extra provides the new mode as an int.
		* @see #EXTRA_TTY_PREFERRED_MODE
		* Broadcast intent action indicating that the TTY preferred operating mode has changed. An
		* intent extra provides the new mode as an int.
		*
		* @see #EXTRA_TTY_PREFERRED_MODE
		* @hide
		*/
		public static final String ACTION_TTY_PREFERRED_MODE_CHANGED =
		"android.telecomm.intent.action.TTY_PREFERRED_MODE_CHANGED";

		/**
		* The lookup key for an int that indicates preferred TTY mode.
		* Valid modes are:
		* - {@link #TTY_MODE_OFF}
		* - {@link #TTY_MODE_FULL}
		* - {@link #TTY_MODE_HCO}
		* - {@link #TTY_MODE_VCO}
		* The lookup key for an int that indicates preferred TTY mode. Valid modes are: -
		* {@link #TTY_MODE_OFF} - {@link #TTY_MODE_FULL} - {@link #TTY_MODE_HCO} -
		* {@link #TTY_MODE_VCO}
		*
		* @hide
		*/
		@@ -247,16 +245,16 @@ public class TelecommManager {
		}

		/**
		* Return the {@link PhoneAccount} which is the user-chosen default for making outgoing
		* phone calls. This {@code PhoneAccount} will always be a member of the list which is
		* returned from calling {@link #getEnabledPhoneAccounts()}.
		* Return the {@link PhoneAccount} which is the user-chosen default for making outgoing phone
		* calls. This {@code PhoneAccount} will always be a member of the list which is returned from
		* calling {@link #getEnabledPhoneAccounts()}.
		* <p>
		* Apps must be prepared for this method to return {@code null}, indicating that there
		* currently exists no user-chosen default {@code PhoneAccount}. In this case, apps
		* wishing to initiate a phone call must either create their {@link android.content
		* .Intent#ACTION_CALL} or {@link android.content.Intent#ACTION_DIAL} {@code Intent} with no
		* {@link TelecommManager#EXTRA_PHONE_ACCOUNT_HANDLE}, or present the user with an affordance
		* to select one of the elements of {@link #getEnabledPhoneAccounts()}.
		* Apps must be prepared for this method to return {@code null}, indicating that there currently
		* exists no user-chosen default {@code PhoneAccount}. In this case, apps wishing to initiate a
		* phone call must either create their {@link android.content .Intent#ACTION_CALL} or
		* {@link android.content.Intent#ACTION_DIAL} {@code Intent} with no
		* {@link TelecommManager#EXTRA_PHONE_ACCOUNT_HANDLE}, or present the user with an affordance to
		* select one of the elements of {@link #getEnabledPhoneAccounts()}.
		* <p>
		* An {@link android.content.Intent#ACTION_CALL} or {@link android.content.Intent#ACTION_DIAL}
		* {@code Intent} with no {@link TelecommManager#EXTRA_PHONE_ACCOUNT_HANDLE} is valid, and
		@@ -297,7 +295,6 @@ public class TelecommManager {
		* resources which can be used in a user interface.
		*
		* @param account The {@link PhoneAccountHandle}.
		*
		* @return The {@link PhoneAccount} object.
		*/
		public PhoneAccount getPhoneAccount(PhoneAccountHandle account) {
		@@ -408,9 +405,9 @@ public class TelecommManager {
		}

		/**
		* Ends an ongoing call. TODO(santoscordon): L-release - need to convert all invocations of
		* ITelecommService#endCall to use this method (clockwork & gearhead).
		*
		* Ends an ongoing call.
		* TODO: L-release - need to convert all invocations of ITelecommService#endCall to use this
		* method (clockwork & gearhead).
		* @hide
		*/
		@SystemApi
		@@ -427,8 +424,8 @@ public class TelecommManager {

		/**
		* If there is a ringing incoming call, this method accepts the call on behalf of the user.
		* TODO(santoscordon): L-release - need to convert all invocation of
		* ITelecommService#answerRingingCall to use this method (clockwork & gearhead).
		* TODO: L-release - need to convert all invocation of ITelecommService#answerRingingCall to use
		* this method (clockwork & gearhead).
		*
		* @hide
		*/
		@@ -478,12 +475,12 @@ public class TelecommManager {

		/**
		* Returns the current TTY mode of the device. For TTY to be on the user must enable it in
		* settings and have a wired headset plugged in. Valid modes are:
		* settings and have a wired headset plugged in.
		* Valid modes are:
		* - {@link TelecommManager#TTY_MODE_OFF}
		* - {@link TelecommManager#TTY_MODE_FULL}
		* - {@link TelecommManager#TTY_MODE_HCO}
		* - {@link TelecommManager#TTY_MODE_VCO}
		*
		* @hide
		*/
		public int getCurrentTtyMode() {
		@@ -497,6 +494,31 @@ public class TelecommManager {
		return TTY_MODE_OFF;
		}

		/**
		* Registers a new incoming call. A {@link ConnectionService} should invoke this method when it
		* has an incoming call. The specified {@link PhoneAccountHandle} must have been registered
		* with {@link #registerPhoneAccount} and subsequently enabled by the user within the phone's
		* settings. Once invoked, this method will cause the system to bind to the
		* {@link ConnectionService} associated with the {@link PhoneAccountHandle} and request
		* additional information about the call (See
		* {@link ConnectionService#onCreateIncomingConnection}) before starting the incoming call UI.
		*
		* @param phoneAccount A {@link PhoneAccountHandle} registered with
		* {@link #registerPhoneAccount}.
		* @param extras A bundle that will be passed through to
		* {@link ConnectionService#onCreateIncomingConnection}.
		*/
		public void addNewIncomingCall(PhoneAccountHandle phoneAccount, Bundle extras) {
		try {
		if (isServiceConnected()) {
		getTelecommService().addNewIncomingCall(
		phoneAccount, extras == null ? new Bundle() : extras);
		}
		} catch (RemoteException e) {
		Log.e(TAG, "RemoteException adding a new incoming call: " + phoneAccount, e);
		}
		}

		private ITelecommService getTelecommService() {
		return ITelecommService.Stub.asInterface(ServiceManager.getService(TELECOMM_SERVICE_NAME));
		}

telecomm/java/com/android/internal/telecomm/ITelecommService.aidl

+6 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.internal.telecomm;

		import android.content.ComponentName;
		import android.telecomm.PhoneAccountHandle;
		import android.os.Bundle;
		import android.telecomm.PhoneAccount;

		/**
		@@ -116,4 +117,9 @@ interface ITelecommService {
		* @see TelecomManager#getCurrentTtyMode
		*/
		int getCurrentTtyMode();

		/**
		* @see TelecommManager#addNewIncomingCall
		*/
		void addNewIncomingCall(in PhoneAccountHandle phoneAccount, in Bundle extras);
		}