Merge "Additional javadoc." into mnc-dev (b6acf517) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/TelecomManager.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ public class TelecomManager {
		* Optional extra for {@link android.content.Intent#ACTION_CALL} and
		* {@link android.content.Intent#ACTION_DIAL} {@code Intent} containing a {@link Bundle}
		* which contains metadata about the call. This {@link Bundle} will be saved into
		* {@code Call.Details}.
		* {@code Call.Details} and passed to the {@link ConnectionService} when placing the call.
		*/
		public static final String EXTRA_OUTGOING_CALL_EXTRAS =
		"android.telecom.extra.OUTGOING_CALL_EXTRAS";
		@@ -1166,6 +1166,14 @@ public class TelecomManager {
		* telecomManager.placeCall(uri, extras);
		* </pre>
		*
		* The following keys are supported in the supplied extras.
		* <ul>
		* <li>{@link #EXTRA_OUTGOING_CALL_EXTRAS}</li>
		* <li>{@link #EXTRA_PHONE_ACCOUNT_HANDLE}</li>
		* <li>{@link #EXTRA_START_CALL_WITH_SPEAKERPHONE}</li>
		* <li>{@link #EXTRA_START_CALL_WITH_VIDEO_STATE}</li>
		* </ul>
		*
		* @param address The address to make the call to.
		* @param extras Bundle of extras to use with the call.
		*/