Merge "API Review cleanups." am: f2a5615087 am: 1ce250aaea (ffbb29d8) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −5

api/system-current.txt

+8 −9

api/test-current.txt

+8 −9

telecomm/java/android/telecom/Call.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -546,7 +546,7 @@ public final class Call {
	*		*
	* @see TelecomManager#EXTRA_USE_ASSISTED_DIALING		* @see TelecomManager#EXTRA_USE_ASSISTED_DIALING
	*/		*/
	public static final int PROPERTY_ASSISTED_DIALING_USED = 0x00000200;		public static final int PROPERTY_ASSISTED_DIALING = 0x00000200;

	/**		/**
	* Indicates that the call is an RTT call. Use {@link #getRttCall()} to get the		* Indicates that the call is an RTT call. Use {@link #getRttCall()} to get the
	@@ -754,7 +754,7 @@ public final class Call {
	if (hasProperty(properties, PROPERTY_HAS_CDMA_VOICE_PRIVACY)) {		if (hasProperty(properties, PROPERTY_HAS_CDMA_VOICE_PRIVACY)) {
	builder.append(" PROPERTY_HAS_CDMA_VOICE_PRIVACY");		builder.append(" PROPERTY_HAS_CDMA_VOICE_PRIVACY");
	}		}
	if (hasProperty(properties, PROPERTY_ASSISTED_DIALING_USED)) {		if (hasProperty(properties, PROPERTY_ASSISTED_DIALING)) {
	builder.append(" PROPERTY_ASSISTED_DIALING_USED");		builder.append(" PROPERTY_ASSISTED_DIALING_USED");
	}		}
	if (hasProperty(properties, PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL)) {		if (hasProperty(properties, PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL)) {

telecomm/java/android/telecom/Conference.java

+76 −12

Original line number	Original line	Diff line number	Diff line
	@@ -16,8 +16,13 @@

	package android.telecom;		package android.telecom;

			import static android.Manifest.permission.MODIFY_PHONE_STATE;

			import android.annotation.ElapsedRealtimeLong;
			import android.annotation.IntRange;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
			import android.annotation.RequiresPermission;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	import android.annotation.TestApi;		import android.annotation.TestApi;
	import android.net.Uri;		import android.net.Uri;
	@@ -632,12 +637,12 @@ public abstract class Conference extends Conferenceable {
	* Should be specified in wall-clock time returned by {@link System#currentTimeMillis()}.		* Should be specified in wall-clock time returned by {@link System#currentTimeMillis()}.
	* <p>		* <p>
	* When setting the connection time, you should always set the connection elapsed time via		* When setting the connection time, you should always set the connection elapsed time via
	* {@link #setConnectionStartElapsedRealTime(long)} to ensure the duration is reflected.		* {@link #setConnectionStartElapsedRealtimeMillis(long)} to ensure the duration is reflected.
	*		*
	* @param connectionTimeMillis The connection time, in milliseconds, as returned by		* @param connectionTimeMillis The connection time, in milliseconds, as returned by
	* {@link System#currentTimeMillis()}.		* {@link System#currentTimeMillis()}.
	*/		*/
	public final void setConnectionTime(long connectionTimeMillis) {		public final void setConnectionTime(@IntRange(from = 0) long connectionTimeMillis) {
	mConnectTimeMillis = connectionTimeMillis;		mConnectTimeMillis = connectionTimeMillis;
	}		}

	@@ -653,8 +658,28 @@ public abstract class Conference extends Conferenceable {
	*		*
	* @param connectionStartElapsedRealTime The connection time, as measured by		* @param connectionStartElapsedRealTime The connection time, as measured by
	* {@link SystemClock#elapsedRealtime()}.		* {@link SystemClock#elapsedRealtime()}.
			* @deprecated use {@link #setConnectionStartElapsedRealtimeMillis(long)} instead.
	*/		*/
			@Deprecated
	public final void setConnectionStartElapsedRealTime(long connectionStartElapsedRealTime) {		public final void setConnectionStartElapsedRealTime(long connectionStartElapsedRealTime) {
			setConnectionStartElapsedRealtimeMillis(connectionStartElapsedRealTime);
			}

			/**
			* Sets the start time of the {@link Conference} which is the basis for the determining the
			* duration of the {@link Conference}.
			* <p>
			* You should use a value returned by {@link SystemClock#elapsedRealtime()} to ensure that time
			* zone changes do not impact the conference duration.
			* <p>
			* When setting this, you should also set the connection time via
			* {@link #setConnectionTime(long)}.
			*
			* @param connectionStartElapsedRealTime The connection time, as measured by
			* {@link SystemClock#elapsedRealtime()}.
			*/
			public final void setConnectionStartElapsedRealtimeMillis(
			@ElapsedRealtimeLong long connectionStartElapsedRealTime) {
	mConnectionStartElapsedRealTime = connectionStartElapsedRealTime;		mConnectionStartElapsedRealTime = connectionStartElapsedRealTime;
	}		}

	@@ -675,7 +700,7 @@ public abstract class Conference extends Conferenceable {
	*		*
	* @return The time at which the {@code Conference} was connected.		* @return The time at which the {@code Conference} was connected.
	*/		*/
	public final long getConnectionTime() {		public final @IntRange(from = 0) long getConnectionTime() {
	return mConnectTimeMillis;		return mConnectTimeMillis;
	}		}

	@@ -692,11 +717,8 @@ public abstract class Conference extends Conferenceable {
	* has no general use other than to the Telephony framework.		* has no general use other than to the Telephony framework.
	*		*
	* @return The elapsed time at which the {@link Conference} was connected.		* @return The elapsed time at which the {@link Conference} was connected.
	* @hide
	*/		*/
	@SystemApi		public final @ElapsedRealtimeLong long getConnectionStartElapsedRealtimeMillis() {
	@TestApi
	public final long getConnectionStartElapsedRealTime() {
	return mConnectionStartElapsedRealTime;		return mConnectionStartElapsedRealTime;
	}		}

	@@ -994,6 +1016,7 @@ public abstract class Conference extends Conferenceable {
	*/		*/
	@SystemApi		@SystemApi
	@TestApi		@TestApi
			@RequiresPermission(MODIFY_PHONE_STATE)
	public void setConferenceState(boolean isConference) {		public void setConferenceState(boolean isConference) {
	for (Listener l : mListeners) {		for (Listener l : mListeners) {
	l.onConferenceStateChanged(this, isConference);		l.onConferenceStateChanged(this, isConference);
	@@ -1014,6 +1037,7 @@ public abstract class Conference extends Conferenceable {
	*/		*/
	@SystemApi		@SystemApi
	@TestApi		@TestApi
			@RequiresPermission(MODIFY_PHONE_STATE)
	public final void setAddress(@NonNull Uri address,		public final void setAddress(@NonNull Uri address,
	@TelecomManager.Presentation int presentation) {		@TelecomManager.Presentation int presentation) {
	Log.d(this, "setAddress %s", address);		Log.d(this, "setAddress %s", address);
	@@ -1120,12 +1144,52 @@ public abstract class Conference extends Conferenceable {
	}		}

	/**		/**
	* Sends an event associated with this {@code Conference} with associated event extras to the		* Sends an event associated with this {@link Conference} with associated event extras to the
	* {@link InCallService} (note: this is identical in concept to		* {@link InCallService}.
	* {@link Connection#sendConnectionEvent(String, Bundle)}).		* <p>
	* @see Connection#sendConnectionEvent(String, Bundle)		* Connection events are used to communicate point in time information from a
			* {@link ConnectionService} to an {@link InCallService} implementation. An example of a
			* custom connection event includes notifying the UI when a WIFI call has been handed over to
			* LTE, which the InCall UI might use to inform the user that billing charges may apply. The
			* Android Telephony framework will send the {@link Connection#EVENT_MERGE_COMPLETE}
			* connection event when a call to {@link Call#mergeConference()} has completed successfully.
			* <p>
			* Events are exposed to {@link InCallService} implementations via
			* {@link Call.Callback#onConnectionEvent(Call, String, Bundle)}.
			* <p>
			* No assumptions should be made as to how an In-Call UI or service will handle these events.
			* The {@link ConnectionService} must assume that the In-Call UI could even chose to ignore
			* some events altogether.
			* <p>
			* Events should be fully qualified (e.g. {@code com.example.event.MY_EVENT}) to avoid
			* conflicts between {@link ConnectionService} implementations. Further, custom
			* {@link ConnectionService} implementations shall not re-purpose events in the
			* {@code android.*} namespace, nor shall they define new event types in this namespace. When
			* defining a custom event type, ensure the contents of the extras {@link Bundle} is clearly
			* defined. Extra keys for this bundle should be named similar to the event type (e.g.
			* {@code com.example.extra.MY_EXTRA}).
			* <p>
			* When defining events and the associated extras, it is important to keep their behavior
			* consistent when the associated {@link ConnectionService} is updated. Support for deprecated
			* events/extras should me maintained to ensure backwards compatibility with older
			* {@link InCallService} implementations which were built to support the older behavior.
			* <p>
			* Expected connection events from the Telephony stack are:
			* <p>
			* <ul>
			* <li>{@link Connection#EVENT_CALL_HOLD_FAILED} with {@code null} {@code extras} when the
			* {@link Conference} could not be held.</li>
			* <li>{@link Connection#EVENT_MERGE_START} with {@code null} {@code extras} when a new
			* call is being merged into the conference.</li>
			* <li>{@link Connection#EVENT_MERGE_COMPLETE} with {@code null} {@code extras} a new call
			* has completed being merged into the conference.</li>
			* <li>{@link Connection#EVENT_CALL_MERGE_FAILED} with {@code null} {@code extras} a new
			* call has failed to merge into the conference (the dialer app can determine which call
			* failed to merge based on the fact that the call still exists outside of the conference
			* at the end of the merge process).</li>
			* </ul>
	*		*
	* @param event The connection event.		* @param event The conference event.
	* @param extras Optional bundle containing extra information associated with the event.		* @param extras Optional bundle containing extra information associated with the event.
	*/		*/
	public void sendConferenceEvent(@NonNull String event, @Nullable Bundle extras) {		public void sendConferenceEvent(@NonNull String event, @Nullable Bundle extras) {