Merge "Add the assisted dialing carrier config." (fb39fd90) · Commits · e / os / android_frameworks_base

api/current.txt

+19 −1

Original line number	Diff line number	Diff line
		@@ -34033,9 +34033,10 @@ package android.provider {
		field public static final java.lang.String DURATION = "duration";
		field public static final java.lang.String EXTRA_CALL_TYPE_FILTER = "android.provider.extra.CALL_TYPE_FILTER";
		field public static final java.lang.String FEATURES = "features";
		field public static final int FEATURES_ASSISTED_DIALING_USED = 16; // 0x10
		field public static final int FEATURES_HD_CALL = 4; // 0x4
		field public static final int FEATURES_PULLED_EXTERNALLY = 2; // 0x2
		field public static final int FEATURES_RTT = 16; // 0x10
		field public static final int FEATURES_RTT = 32; // 0x20
		field public static final int FEATURES_VIDEO = 1; // 0x1
		field public static final int FEATURES_WIFI = 8; // 0x8
		field public static final java.lang.String GEOCODED_LOCATION = "geocoded_location";
		@@ -39883,6 +39884,7 @@ 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 int PROPERTY_ASSISTED_DIALING_USED = 512; // 0x200
		field public static final int PROPERTY_CONFERENCE = 1; // 0x1
		field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4
		field public static final int PROPERTY_ENTERPRISE_CALL = 32; // 0x20
		@@ -40103,6 +40105,7 @@ package android.telecom {
		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 PROPERTY_ASSISTED_DIALING_USED = 512; // 0x200
		field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 32; // 0x20
		field public static final int PROPERTY_IS_EXTERNAL_CALL = 16; // 0x10
		field public static final int PROPERTY_IS_RTT = 256; // 0x100
		@@ -40525,6 +40528,7 @@ package android.telecom {
		field public static final java.lang.String ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS = "android.telecom.action.SHOW_RESPOND_VIA_SMS_SETTINGS";
		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_ASSISTED_DIALING_TRANSFORMATION_INFO = "android.telecom.extra.ASSISTED_DIALING_TRANSFORMATION_INFO";
		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";
		@@ -40540,6 +40544,7 @@ package android.telecom {
		field public static final java.lang.String EXTRA_START_CALL_WITH_RTT = "android.telecom.extra.START_CALL_WITH_RTT";
		field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";
		field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.telecom.extra.START_CALL_WITH_VIDEO_STATE";
		field public static final java.lang.String EXTRA_USE_ASSISTED_DIALING = "android.telecom.extra.USE_ASSISTED_DIALING";
		field public static final java.lang.String GATEWAY_ORIGINAL_ADDRESS = "android.telecom.extra.GATEWAY_ORIGINAL_ADDRESS";
		field public static final java.lang.String GATEWAY_PROVIDER_PACKAGE = "android.telecom.extra.GATEWAY_PROVIDER_PACKAGE";
		field public static final java.lang.String METADATA_INCLUDE_EXTERNAL_CALLS = "android.telecom.INCLUDE_EXTERNAL_CALLS";
		@@ -40552,6 +40557,18 @@ package android.telecom {
		field public static final int PRESENTATION_UNKNOWN = 3; // 0x3
		}

		public final class TransformationInfo implements android.os.Parcelable {
		ctor public TransformationInfo(java.lang.String, java.lang.String, java.lang.String, java.lang.String, int);
		method public int describeContents();
		method public java.lang.String getOriginalNumber();
		method public java.lang.String getTransformedNumber();
		method public int getTransformedNumberCountryCallingCode();
		method public java.lang.String getUserHomeCountryCode();
		method public java.lang.String getUserRoamingCountryCode();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telecom.TransformationInfo> CREATOR;
		}

		public class VideoProfile implements android.os.Parcelable {
		ctor public VideoProfile(int);
		ctor public VideoProfile(int, int);
		@@ -40715,6 +40732,7 @@ package android.telephony {
		field public static final java.lang.String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool";
		field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";
		field public static final java.lang.String KEY_APN_EXPAND_BOOL = "apn_expand_bool";
		field public static final java.lang.String KEY_ASSISTED_DIALING_ENABLED_BOOL = "assisted_dialing_enabled_bool";
		field public static final java.lang.String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";
		field public static final java.lang.String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY = "call_forwarding_blocks_while_roaming_string_array";
		field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool";

core/java/android/provider/CallLog.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -223,14 +223,13 @@ public class CallLog {
		/** Call was WIFI call. */
		public static final int FEATURES_WIFI = 1 << 3;

		/** Call was on RTT at some point */
		public static final int FEATURES_RTT = 1 << 4;

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

		/** Call was on RTT at some point */
		public static final int FEATURES_RTT = 1 << 5;

		/**
		* The phone number as the user entered it.

telecomm/java/android/telecom/Call.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -419,7 +419,6 @@ public final class Call {
		/**
		* Indicates the call used Assisted Dialing.
		* See also {@link Connection#PROPERTY_ASSISTED_DIALING_USED}
		* @hide
		*/
		public static final int PROPERTY_ASSISTED_DIALING_USED = 0x00000200;

telecomm/java/android/telecom/Connection.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import android.os.IBinder;
		import android.os.Looper;
		import android.os.Message;
		import android.os.ParcelFileDescriptor;
		import android.os.Parcelable;
		import android.os.RemoteException;
		import android.os.SystemClock;
		import android.util.ArraySet;
		@@ -401,7 +402,6 @@ public abstract class Connection extends Conferenceable {

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

		@@ -2537,6 +2537,19 @@ public abstract class Connection extends Conferenceable {
		putExtras(newExtras);
		}

		/**
		* Adds a parcelable extra to this {@code Connection}.
		*
		* @param key The extra key.
		* @param value The value.
		* @hide
		*/
		public final void putExtra(@NonNull String key, @NonNull Parcelable value) {
		Bundle newExtras = new Bundle();
		newExtras.putParcelable(key, value);
		putExtras(newExtras);
		}

		/**
		* Removes extras from this {@code Connection}.
		*

telecomm/java/android/telecom/TelecomManager.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -602,11 +602,16 @@ public class TelecomManager {
		/**
		* 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 bundle indicated by this extra store information related to the assisted dialing action.
		*/
		public static final String EXTRA_ASSISTED_DIALING_TRANSFORMATION_INFO =
		"android.telecom.extra.ASSISTED_DIALING_TRANSFORMATION_INFO";

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