am bd19c1bd: am 4cfe2a8c: am f26ec92d: am a21b2e30: resolved conflicts for... (4e38bc23) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -30145,6 +30145,9 @@ package android.telecom {
		field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 2048; // 0x800
		field public static final int CAPABILITY_SUPPORT_HOLD = 2; // 0x2
		field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
		field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";
		field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS";
		field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";
		field public static final int STATE_ACTIVE = 4; // 0x4
		field public static final int STATE_DIALING = 3; // 0x3
		field public static final int STATE_DISCONNECTED = 6; // 0x6
		@@ -30505,6 +30508,7 @@ package android.telecom {
		field public static final java.lang.String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";
		field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";
		field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";
		field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";
		field public static final java.lang.String EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME = "android.telecom.extra.CHANGE_DEFAULT_DIALER_PACKAGE_NAME";
		field public static final java.lang.String EXTRA_INCOMING_CALL_ADDRESS = "android.telecom.extra.INCOMING_CALL_ADDRESS";
		field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS";

api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -32347,6 +32347,9 @@ package android.telecom {
		field public static final int CAPABILITY_SUPPORTS_VT_REMOTE_TX = 2048; // 0x800
		field public static final int CAPABILITY_SUPPORT_HOLD = 2; // 0x2
		field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
		field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";
		field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS";
		field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";
		field public static final int STATE_ACTIVE = 4; // 0x4
		field public static final int STATE_DIALING = 3; // 0x3
		field public static final int STATE_DISCONNECTED = 6; // 0x6
		@@ -32755,6 +32758,7 @@ package android.telecom {
		field public static final java.lang.String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";
		field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";
		field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";
		field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";
		field public static final java.lang.String EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME = "android.telecom.extra.CHANGE_DEFAULT_DIALER_PACKAGE_NAME";
		field public static final java.lang.String EXTRA_CONNECTION_SERVICE = "android.telecom.extra.CONNECTION_SERVICE";
		field public static final java.lang.String EXTRA_INCOMING_CALL_ADDRESS = "android.telecom.extra.INCOMING_CALL_ADDRESS";

telecomm/java/android/telecom/Connection.java

+21 −8

Original line number	Diff line number	Diff line
		@@ -253,20 +253,33 @@ public abstract class Connection extends Conferenceable {
		//**********************************************************************************************

		/**
		* Call extras key to pack/unpack call history info.
		* The value for this key should be an ArrayList of Strings.
		* TODO: Remove this -- retained so the build won't break. However, future work will remove it.
		* @hide
		*/
		public static final String EXTRA_CALL_HISTORY_INFO = "android.telecom.EXTRA_CALL_HISTORY_INFO";

		/**
		* Connection {@link #mExtras} key used to store a child number associated with the current
		* connection. Used to communicate to the user interface that the connection was received via
		* a child address (in telephony phone number) associated with the {@link PhoneAccount}'s
		* primary address.
		* @hide
		* Connection extra key used to store the last forwarded number associated with the current
		* connection. Used to communicate to the user interface that the connection was forwarded via
		* the specified number.
		*/
		public static final String EXTRA_LAST_FORWARDED_NUMBER =
		"android.telecom.extra.LAST_FORWARDED_NUMBER";

		/**
		* Connection extra key used to store a child number associated with the current connection.
		* Used to communicate to the user interface that the connection was received via
		* a child address (i.e. phone number) associated with the {@link PhoneAccount}'s primary
		* address.
		*/
		public static final String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS";

		/**
		* Connection extra key used to store the subject for an incoming call. The user interface can
		* query this extra and display its contents for incoming calls. Will only be used if the
		* {@link PhoneAccount} supports the capability {@link PhoneAccount#CAPABILITY_CALL_SUBJECT}.
		*/
		public static final String EXTRA_CHILD_ADDRESS = "android.telecom.EXTRA_CHILD_ADDRESS";
		public static final String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";

		// Flag controlling whether PII is emitted into the logs
		private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);

telecomm/java/android/telecom/TelecomManager.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,13 @@ public class TelecomManager {
		public static final String EXTRA_PHONE_ACCOUNT_HANDLE =
		"android.telecom.extra.PHONE_ACCOUNT_HANDLE";

		/**
		* Optional extra for {@link android.content.Intent#ACTION_CALL} containing a string call
		* subject which will be associated with an outgoing call. Should only be specified if the
		* {@link PhoneAccount} supports the capability {@link PhoneAccount#CAPABILITY_CALL_SUBJECT}.
		*/
		public static final String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";

		/**
		* The extra used by a {@link ConnectionService} to provide the handle of the caller that
		* has initiated a new incoming call.