Merge "Hide multi-endpoint APIs." into nyc-dev (d54c077d) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −39

Original line number	Diff line number	Diff line
		@@ -30747,7 +30747,6 @@ package android.provider {
		public static class CallLog.Calls implements android.provider.BaseColumns {
		ctor public CallLog.Calls();
		method public static java.lang.String getLastOutgoingCall(android.content.Context);
		field public static final int ANSWERED_EXTERNALLY_TYPE = 7; // 0x7
		field public static final int BLOCKED_TYPE = 6; // 0x6
		field public static final java.lang.String CACHED_FORMATTED_NUMBER = "formatted_number";
		field public static final java.lang.String CACHED_LOOKUP_URI = "lookup_uri";
		@@ -30770,7 +30769,6 @@ 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_PULLED_EXTERNALLY = 2; // 0x2
		field public static final int FEATURES_VIDEO = 1; // 0x1
		field public static final java.lang.String GEOCODED_LOCATION = "geocoded_location";
		field public static final int INCOMING_TYPE = 1; // 0x1
		@@ -36054,13 +36052,9 @@ package android.telecom {
		method public void phoneAccountSelected(android.telecom.PhoneAccountHandle, boolean);
		method public void playDtmfTone(char);
		method public void postDialContinue(boolean);
		method public void pullExternalCall();
		method public final void putExtras(android.os.Bundle);
		method public void registerCallback(android.telecom.Call.Callback);
		method public void registerCallback(android.telecom.Call.Callback, android.os.Handler);
		method public void reject(boolean, java.lang.String);
		method public final void removeExtras(java.util.List<java.lang.String>);
		method public void sendCallEvent(java.lang.String, android.os.Bundle);
		method public void splitFromConference();
		method public void stopDtmfTone();
		method public void swapConference();
		@@ -36074,7 +36068,6 @@ package android.telecom {
		field public static final int STATE_DISCONNECTING = 10; // 0xa
		field public static final int STATE_HOLDING = 3; // 0x3
		field public static final int STATE_NEW = 0; // 0x0
		field public static final int STATE_PULLING_CALL = 11; // 0xb
		field public static final int STATE_RINGING = 2; // 0x2
		field public static final int STATE_SELECT_PHONE_ACCOUNT = 8; // 0x8
		}
		@@ -36085,7 +36078,6 @@ package android.telecom {
		method public void onCannedTextResponsesLoaded(android.telecom.Call, java.util.List<java.lang.String>);
		method public void onChildrenChanged(android.telecom.Call, java.util.List<android.telecom.Call>);
		method public void onConferenceableCallsChanged(android.telecom.Call, java.util.List<android.telecom.Call>);
		method public void onConnectionEvent(android.telecom.Call, java.lang.String, android.os.Bundle);
		method public void onDetailsChanged(android.telecom.Call, android.telecom.Call.Details);
		method public void onParentChanged(android.telecom.Call, android.telecom.Call);
		method public void onPostDialWait(android.telecom.Call, java.lang.String);
		@@ -36116,7 +36108,6 @@ package android.telecom {
		method public static java.lang.String propertiesToString(int);
		field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 4194304; // 0x400000
		field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000
		field public static final int CAPABILITY_CAN_PULL_CALL = 8388608; // 0x800000
		field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000
		field public static final int CAPABILITY_HOLD = 1; // 0x1
		field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80
		@@ -36136,7 +36127,6 @@ package android.telecom {
		field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4
		field public static final int PROPERTY_GENERIC_CONFERENCE = 2; // 0x2
		field public static final int PROPERTY_HIGH_DEF_AUDIO = 16; // 0x10
		field public static final int PROPERTY_IS_EXTERNAL_CALL = 64; // 0x40
		field public static final int PROPERTY_WIFI = 8; // 0x8
		field public static final int PROPERTY_WORK_CALL = 32; // 0x20
		}
		@@ -36188,7 +36178,6 @@ package android.telecom {
		method public final android.telecom.CallAudioState getCallAudioState();
		method public final java.util.List<android.telecom.Connection> getConferenceableConnections();
		method public final int getConnectionCapabilities();
		method public final int getConnectionProperties();
		method public final long getConnectionTime();
		method public final java.util.List<android.telecom.Connection> getConnections();
		method public final android.telecom.DisconnectCause getDisconnectCause();
		@@ -36201,7 +36190,6 @@ package android.telecom {
		method public void onCallAudioStateChanged(android.telecom.CallAudioState);
		method public void onConnectionAdded(android.telecom.Connection);
		method public void onDisconnect();
		method public void onExtrasChanged(android.os.Bundle);
		method public void onHold();
		method public void onMerge(android.telecom.Connection);
		method public void onMerge();
		@@ -36210,17 +36198,14 @@ package android.telecom {
		method public void onStopDtmfTone();
		method public void onSwap();
		method public void onUnhold();
		method public final void putExtras(android.os.Bundle);
		method public final void removeConnection(android.telecom.Connection);
		method public final void removeExtras(java.util.List<java.lang.String>);
		method public final void setActive();
		method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
		method public final void setConnectionCapabilities(int);
		method public final void setConnectionProperties(int);
		method public final void setConnectionTime(long);
		method public final void setDialing();
		method public final void setDisconnected(android.telecom.DisconnectCause);
		method public final deprecated void setExtras(android.os.Bundle);
		method public final void setExtras(android.os.Bundle);
		method public final void setOnHold();
		method public final void setStatusHints(android.telecom.StatusHints);
		method public final void setVideoProvider(android.telecom.Connection, android.telecom.Connection.VideoProvider);
		@@ -36246,7 +36231,6 @@ package android.telecom {
		method public final android.telecom.Conference getConference();
		method public final java.util.List<android.telecom.Conferenceable> getConferenceables();
		method public final int getConnectionCapabilities();
		method public final int getConnectionProperties();
		method public final android.telecom.DisconnectCause getDisconnectCause();
		method public final android.os.Bundle getExtras();
		method public final int getState();
		@@ -36257,23 +36241,16 @@ package android.telecom {
		method public void onAnswer(int);
		method public void onAnswer();
		method public void onCallAudioStateChanged(android.telecom.CallAudioState);
		method public void onCallEvent(java.lang.String, android.os.Bundle);
		method public void onDisconnect();
		method public void onExtrasChanged(android.os.Bundle);
		method public void onHold();
		method public void onPlayDtmfTone(char);
		method public void onPostDialContinue(boolean);
		method public void onPullExternalCall();
		method public void onReject();
		method public void onReject(java.lang.String);
		method public void onSeparate();
		method public void onStateChanged(int);
		method public void onStopDtmfTone();
		method public void onUnhold();
		method public static java.lang.String propertiesToString(int);
		method public final void putExtras(android.os.Bundle);
		method public final void removeExtras(java.util.List<java.lang.String>);
		method public void sendConnectionEvent(java.lang.String, android.os.Bundle);
		method public final void setActive();
		method public final void setAddress(android.net.Uri, int);
		method public final void setAudioModeIsVoip(boolean);
		@@ -36281,10 +36258,9 @@ package android.telecom {
		method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
		method public final void setConferenceables(java.util.List<android.telecom.Conferenceable>);
		method public final void setConnectionCapabilities(int);
		method public final void setConnectionProperties(int);
		method public final void setDialing();
		method public final void setDisconnected(android.telecom.DisconnectCause);
		method public final deprecated void setExtras(android.os.Bundle);
		method public final void setExtras(android.os.Bundle);
		method public final void setInitialized();
		method public final void setInitializing();
		method public final void setNextPostDialChar(char);
		@@ -36298,7 +36274,6 @@ package android.telecom {
		method public static java.lang.String stateToString(int);
		field public static final int CAPABILITY_CANNOT_DOWNGRADE_VIDEO_TO_AUDIO = 8388608; // 0x800000
		field public static final int CAPABILITY_CAN_PAUSE_VIDEO = 1048576; // 0x100000
		field public static final int CAPABILITY_CAN_PULL_CALL = 16777216; // 0x1000000
		field public static final int CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION = 4194304; // 0x400000
		field public static final int CAPABILITY_CAN_UPGRADE_TO_VIDEO = 524288; // 0x80000
		field public static final int CAPABILITY_DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000
		@@ -36316,18 +36291,15 @@ 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 java.lang.String EVENT_CALL_PULL_FAILED = "android.telecom.event.CALL_PULL_FAILED";
		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_IS_EXTERNAL_CALL = 16; // 0x10
		field public static final int STATE_ACTIVE = 4; // 0x4
		field public static final int STATE_DIALING = 3; // 0x3
		field public static final int STATE_DISCONNECTED = 6; // 0x6
		field public static final int STATE_HOLDING = 5; // 0x5
		field public static final int STATE_INITIALIZING = 0; // 0x0
		field public static final int STATE_NEW = 1; // 0x1
		field public static final int STATE_PULLING_CALL = 7; // 0x7
		field public static final int STATE_RINGING = 2; // 0x2
		}

		@@ -36405,9 +36377,7 @@ package android.telecom {
		method public java.lang.String getReason();
		method public int getTone();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int ANSWERED_ELSEWHERE = 11; // 0xb
		field public static final int BUSY = 7; // 0x7
		field public static final int CALL_PULLED = 12; // 0xc
		field public static final int CANCELED = 4; // 0x4
		field public static final int CONNECTION_MANAGER_NOT_SUPPORTED = 10; // 0xa
		field public static final android.os.Parcelable.Creator<android.telecom.DisconnectCause> CREATOR;
		@@ -36443,7 +36413,6 @@ package android.telecom {
		method public void onCallAudioStateChanged(android.telecom.CallAudioState);
		method public void onCallRemoved(android.telecom.Call);
		method public void onCanAddCallChanged(boolean);
		method public void onConnectionEvent(android.telecom.Call, java.lang.String, android.os.Bundle);
		method public void onSilenceRinger();
		method public final void setAudioRoute(int);
		method public final void setMuted(boolean);
		@@ -36566,7 +36535,6 @@ package android.telecom {
		method public void onConferenceableConnectionsChanged(android.telecom.RemoteConference, java.util.List<android.telecom.RemoteConnection>);
		method public void onConnectionAdded(android.telecom.RemoteConference, android.telecom.RemoteConnection);
		method public void onConnectionCapabilitiesChanged(android.telecom.RemoteConference, int);
		method public void onConnectionPropertiesChanged(android.telecom.RemoteConference, int);
		method public void onConnectionRemoved(android.telecom.RemoteConference, android.telecom.RemoteConnection);
		method public void onDestroyed(android.telecom.RemoteConference);
		method public void onDisconnected(android.telecom.RemoteConference, android.telecom.DisconnectCause);
		@@ -36585,7 +36553,6 @@ package android.telecom {
		method public android.telecom.RemoteConference getConference();
		method public java.util.List<android.telecom.RemoteConnection> getConferenceableConnections();
		method public int getConnectionCapabilities();
		method public int getConnectionProperties();
		method public android.telecom.DisconnectCause getDisconnectCause();
		method public final android.os.Bundle getExtras();
		method public int getState();
		@@ -36597,7 +36564,6 @@ package android.telecom {
		method public boolean isVoipAudioMode();
		method public void playDtmfTone(char);
		method public void postDialContinue(boolean);
		method public void pullExternalCall();
		method public void registerCallback(android.telecom.RemoteConnection.Callback);
		method public void registerCallback(android.telecom.RemoteConnection.Callback, android.os.Handler);
		method public void reject();
		@@ -36614,8 +36580,6 @@ package android.telecom {
		method public void onConferenceChanged(android.telecom.RemoteConnection, android.telecom.RemoteConference);
		method public void onConferenceableConnectionsChanged(android.telecom.RemoteConnection, java.util.List<android.telecom.RemoteConnection>);
		method public void onConnectionCapabilitiesChanged(android.telecom.RemoteConnection, int);
		method public void onConnectionEvent(android.telecom.RemoteConnection, java.lang.String, android.os.Bundle);
		method public void onConnectionPropertiesChanged(android.telecom.RemoteConnection, int);
		method public void onDestroyed(android.telecom.RemoteConnection);
		method public void onDisconnected(android.telecom.RemoteConnection, android.telecom.DisconnectCause);
		method public void onExtrasChanged(android.telecom.RemoteConnection, android.os.Bundle);
		@@ -36712,7 +36676,6 @@ package android.telecom {
		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 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";
		field public static final java.lang.String METADATA_IN_CALL_SERVICE_RINGING = "android.telecom.IN_CALL_SERVICE_RINGING";
		field public static final java.lang.String METADATA_IN_CALL_SERVICE_UI = "android.telecom.IN_CALL_SERVICE_UI";
		field public static final int PRESENTATION_ALLOWED = 1; // 0x1

api/system-current.txt

+2 −39

File changed.

Preview size limit exceeded, changes collapsed.

api/test-current.txt

+2 −39

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/provider/CallLog.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -179,7 +179,6 @@ public class CallLog {
		* <li>{@link #VOICEMAIL_TYPE}</li>
		* <li>{@link #REJECTED_TYPE}</li>
		* <li>{@link #BLOCKED_TYPE}</li>
		* <li>{@link #ANSWERED_EXTERNALLY_TYPE}</li>
		* </ul>
		* </p>
		*/
		@@ -201,6 +200,7 @@ public class CallLog {
		* Call log type for a call which was answered on another device. Used in situations where
		* a call rings on multiple devices simultaneously and it ended up being answered on a
		* device other than the current one.
		* @hide
		*/
		public static final int ANSWERED_EXTERNALLY_TYPE = 7;

		@@ -214,7 +214,10 @@ public class CallLog {
		/** Call had video. */
		public static final int FEATURES_VIDEO = 0x1;

		/** Call was pulled externally. */
		/**
		* Call was pulled externally.
		* @hide
		*/
		public static final int FEATURES_PULLED_EXTERNALLY = 0x2;

		/**

telecomm/java/android/telecom/Call.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,7 @@ public final class Call {
		* An {@link InCallService} will only see this state if it has the
		* {@link TelecomManager#METADATA_INCLUDE_EXTERNAL_CALLS} metadata set to {@code true} in its
		* manifest.
		* @hide
		*/
		public static final int STATE_PULLING_CALL = 11;

		@@ -251,6 +252,7 @@ public final class Call {
		* <p>
		* See {@link Connection#CAPABILITY_CAN_PULL_CALL} and
		* {@link Connection#PROPERTY_IS_EXTERNAL_CALL}.
		* @hide
		*/
		public static final int CAPABILITY_CAN_PULL_CALL = 0x00800000;

		@@ -303,6 +305,7 @@ public final class Call {
		* in its manifest.
		* <p>
		* See {@link Connection#PROPERTY_IS_EXTERNAL_CALL}.
		* @hide
		*/
		public static final int PROPERTY_IS_EXTERNAL_CALL = 0x00000040;

		@@ -783,6 +786,7 @@ public final class Call {
		* @param call The {@code Call} receiving the event.
		* @param event The event.
		* @param extras Extras associated with the connection event.
		* @hide
		*/
		public void onConnectionEvent(Call call, String event, Bundle extras) {}
		}
		@@ -961,6 +965,7 @@ public final class Call {
		* An {@link InCallService} will only see calls which support this method if it has the
		* {@link TelecomManager#METADATA_INCLUDE_EXTERNAL_CALLS} metadata set to {@code true}
		* in its manifest.
		* @hide
		*/
		public void pullExternalCall() {
		// If this isn't an external call, ignore the request.
		@@ -983,6 +988,7 @@ public final class Call {
		*
		* @param event The connection event.
		* @param extras Bundle containing extra information associated with the event.
		* @hide
		*/
		public void sendCallEvent(String event, Bundle extras) {
		mInCallAdapter.sendCallEvent(mTelecomCallId, event, extras);
		@@ -996,6 +1002,7 @@ public final class Call {
		* extras. Keys should be fully qualified (e.g., com.example.MY_EXTRA) to avoid conflicts.
		*
		* @param extras The extras to add.
		* @hide
		*/
		public final void putExtras(Bundle extras) {
		if (extras == null) {
		@@ -1058,6 +1065,7 @@ public final class Call {
		* Removes extras from this {@code Connection}.
		*
		* @param keys The keys of the extras to remove.
		* @hide
		*/
		public final void removeExtras(List<String> keys) {
		if (mExtras != null) {