Merge "Clarify semantics in call composer extras" into sc-dev (c22a3780) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/TelecomManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -314,8 +314,8 @@ public class TelecomManager {
		public static final String EXTRA_HAS_PICTURE = "android.telecom.extra.HAS_PICTURE";

		/**
		* A URI representing the picture that was downloaded when a call is received or uploaded
		* when a call is placed.
		* A {@link Uri} representing the picture that was downloaded when a call is received or
		* uploaded when a call is placed.
		*
		* This is a content URI within the call log provider which can be used to open a file
		* descriptor. This could be set a short time after a call is added to the Dialer app if the

+1 −3

Original line number	Diff line number	Diff line
		@@ -9135,9 +9135,7 @@ public class TelephonyManager {
		/**
		* Set the user-set status for enriched calling with call composer.
		*
		* @param status user-set status for enriched calling with call composer;
		* it must be either {@link #CALL_COMPOSER_STATUS_ON} or
		* {@link #CALL_COMPOSER_STATUS_OFF}.
		* @param status user-set status for enriched calling with call composer.
		*
		* <p>If this object has been created with {@link #createForSubscriptionId}, applies to the
		* given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultSubscriptionId()}

+8 −0

Original line number	Diff line number	Diff line
		@@ -277,6 +277,10 @@ public final class ImsCallProfile implements Parcelable {
		* server infrastructure to get the picture. It can be set via
		* {@link #setCallExtra(String, String)}.
		*
		* Note that this URL is not intended to be parsed by the IMS stack -- it should be sent
		* directly to the network for consumption by the called party or forwarded directly from the
		* network to the platform for caching and download.
		*
		* Reference: RCC.20 Section 2.4.3.2
		*/
		public static final String EXTRA_PICTURE_URL = "android.telephony.ims.extra.PICTURE_URL";
		@@ -729,6 +733,10 @@ public final class ImsCallProfile implements Parcelable {

		/**
		* Set the call extra value (Parcelable), given the call extra name.
		*
		* Note that the {@link Parcelable} provided must be a class defined in the Android API surface,
		* as opposed to a class defined by your app.
		*
		* @param name call extra name
		* @param parcelable call extra value
		*/