Merge "Add assisted dialing properties to the framework." into oc-mr1-dev (4f6d728e) · Commits · e / os / android_frameworks_base

core/java/android/provider/CallLog.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -223,6 +223,12 @@ public class CallLog {
		/** Call was WIFI call. */
		public static final int FEATURES_WIFI = 0x8;

		/**
		* Indicates the call underwent Assisted Dialing.
		* @hide
		*/
		public static final Integer FEATURES_ASSISTED_DIALING_USED = 0x10;

		/**
		* The phone number as the user entered it.
		* <P>Type: TEXT</P>

+11 −1

Original line number	Diff line number	Diff line
		@@ -416,8 +416,15 @@ public final class Call {
		*/
		public static final int PROPERTY_SELF_MANAGED = 0x00000100;

		/**
		* Indicates the call used Assisted Dialing.
		* See also {@link Connection#PROPERTY_ASSISTED_DIALING_USED}
		* @hide
		*/
		public static final int PROPERTY_ASSISTED_DIALING_USED = 0x00000200;

		//******************************************************************************************
		// Next PROPERTY value: 0x00000200
		// Next PROPERTY value: 0x00000400
		//******************************************************************************************

		private final String mTelecomCallId;
		@@ -577,6 +584,9 @@ public final class Call {
		if(hasProperty(properties, PROPERTY_HAS_CDMA_VOICE_PRIVACY)) {
		builder.append(" PROPERTY_HAS_CDMA_VOICE_PRIVACY");
		}
		if(hasProperty(properties, PROPERTY_ASSISTED_DIALING_USED)) {
		builder.append(" PROPERTY_ASSISTED_DIALING_USED");
		}
		builder.append("]");
		return builder.toString();
		}

+7 −1

Original line number	Diff line number	Diff line
		@@ -402,8 +402,14 @@ public abstract class Connection extends Conferenceable {
		@TestApi
		public static final int PROPERTY_IS_RTT = 1 << 8;

		/**
		* Set by the framework to indicate that a connection is using assisted dialing.
		* @hide
		*/
		public static final int PROPERTY_ASSISTED_DIALING_USED = 1 << 9;

		//**********************************************************************************************
		// Next PROPERTY value: 1<<9
		// Next PROPERTY value: 1<<10
		//**********************************************************************************************

		/**

+8 −0

Original line number	Diff line number	Diff line
		@@ -581,6 +581,14 @@ public class TelecomManager {
		public static final String EXTRA_CALL_BACK_INTENT =
		"android.telecom.extra.CALL_BACK_INTENT";

		/**
		* The boolean indicated by this extra controls whether or not a call is eligible to undergo
		* assisted dialing. This extra is stored under {@link #EXTRA_OUTGOING_CALL_EXTRAS}.
		* @hide
		*/
		public static final String EXTRA_USE_ASSISTED_DIALING =
		"android.telecom.extra.USE_ASSISTED_DIALING";

		/**
		* The following 4 constants define how properties such as phone numbers and names are
		* displayed to the user.