Merge "update interface definitions properly" (adb9edb0) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −42

Original line number	Diff line number	Diff line
		@@ -29929,7 +29929,6 @@ package android.telecom {
		method public void hold();
		method public void mergeConference();
		method public void phoneAccountSelected(android.telecom.PhoneAccountHandle, boolean);
		method public void phoneAccountSelected(android.telecom.PhoneAccountHandle);
		method public void playDtmfTone(char);
		method public void postDialContinue(boolean);
		method public void reject(boolean, java.lang.String);
		@@ -29954,7 +29953,6 @@ package android.telecom {
		method public android.telecom.PhoneAccountHandle getAccountHandle();
		method public int getCallCapabilities();
		method public int getCallProperties();
		method public int getCallSubstate();
		method public java.lang.String getCallerDisplayName();
		method public int getCallerDisplayNamePresentation();
		method public long getConnectTimeMillis();
		@@ -30015,7 +30013,6 @@ package android.telecom {
		method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle();
		method public android.telecom.Connection getPrimaryConnection();
		method public final int getState();
		method public void onAddParticipant(java.lang.String);
		method public void onAudioStateChanged(android.telecom.AudioState);
		method public void onConnectionAdded(android.telecom.Connection);
		method public void onDisconnect();
		@@ -30034,9 +30031,7 @@ package android.telecom {
		method public final void setConnectionCapabilities(int);
		method public final void setDisconnected(android.telecom.DisconnectCause);
		method public final void setOnHold();
		method public final void setVideoState(android.telecom.Connection, int);
		field public static long CONNECT_TIME_NOT_SPECIFIED;
		field public static final long NO_CONNECTTIME = 0L; // 0x0L
		field protected android.telecom.PhoneAccountHandle mPhoneAccount;
		}

		@@ -30051,7 +30046,6 @@ package android.telecom {
		method public final boolean getAudioModeIsVoip();
		method public final android.telecom.AudioState getAudioState();
		method public final deprecated int getCallCapabilities();
		method public final int getCallProperties();
		method public final java.lang.String getCallerDisplayName();
		method public final int getCallerDisplayNamePresentation();
		method public final android.telecom.Conference getConference();
		@@ -30064,8 +30058,6 @@ package android.telecom {
		method public void onAbort();
		method public void onAnswer();
		method public void onAudioStateChanged(android.telecom.AudioState);
		method public void onConferenceChanged();
		method public void onConferenceWith(android.telecom.Connection);
		method public void onDisconnect();
		method public void onHold();
		method public void onPlayDtmfTone(char);
		@@ -30075,12 +30067,10 @@ package android.telecom {
		method public void onStateChanged(int);
		method public void onStopDtmfTone();
		method public void onUnhold();
		method public final void resetCdmaConnectionTime();
		method public final void setActive();
		method public final void setAddress(android.net.Uri, int);
		method public final void setAudioModeIsVoip(boolean);
		method public final deprecated void setCallCapabilities(int);
		method public final void setCallProperties(int);
		method public final void setCallerDisplayName(java.lang.String, int);
		method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
		method public final void setConferenceables(java.util.List<android.telecom.IConferenceable>);
		@@ -30088,7 +30078,6 @@ package android.telecom {
		method public final void setConnectionService(android.telecom.ConnectionService);
		method public final void setDialing();
		method public final void setDisconnected(android.telecom.DisconnectCause);
		method public final void setExtras(android.os.Bundle);
		method public final void setInitialized();
		method public final void setInitializing();
		method public final void setOnHold();
		@@ -30097,12 +30086,6 @@ package android.telecom {
		method public final void setRinging();
		method public final void setStatusHints(android.telecom.StatusHints);
		method public static java.lang.String stateToString(int);
		field public static final int CALL_SUBSTATE_ALL = 15; // 0xf
		field public static final int CALL_SUBSTATE_AUDIO_CONNECTED_SUSPENDED = 1; // 0x1
		field public static final int CALL_SUBSTATE_AVP_RETRY = 4; // 0x4
		field public static final int CALL_SUBSTATE_MEDIA_PAUSED = 8; // 0x8
		field public static final int CALL_SUBSTATE_NONE = 0; // 0x0
		field public static final int CALL_SUBSTATE_VIDEO_CONNECTED_SUSPENDED = 2; // 0x2
		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
		@@ -30145,7 +30128,6 @@ package android.telecom {
		method public android.telecom.Connection onCreateOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest);
		method public void onRemoteConferenceAdded(android.telecom.RemoteConference);
		method public void onRemoteExistingConnectionAdded(android.telecom.RemoteConnection);
		method public void triggerConferenceRecalculate();
		field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.ConnectionService";
		}

		@@ -30226,7 +30208,6 @@ package android.telecom {
		method public android.telecom.PhoneAccountHandle getAccountHandle();
		method public android.net.Uri getAddress();
		method public int getCapabilities();
		method public int getColor();
		method public int getHighlightColor();
		method public android.graphics.Bitmap getIconBitmap();
		method public java.lang.String getIconPackageName();
		@@ -30243,7 +30224,6 @@ package android.telecom {
		field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10
		field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4
		field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccount> CREATOR;
		field public static final int NO_COLOR = -1; // 0xffffffff
		field public static final int NO_HIGHLIGHT_COLOR = 0; // 0x0
		field public static final int NO_ICON_TINT = 0; // 0x0
		field public static final int NO_RESOURCE_ID = -1; // 0xffffffff
		@@ -30258,15 +30238,12 @@ package android.telecom {
		method public android.telecom.PhoneAccount build();
		method public android.telecom.PhoneAccount.Builder setAddress(android.net.Uri);
		method public android.telecom.PhoneAccount.Builder setCapabilities(int);
		method public android.telecom.PhoneAccount.Builder setColor(int);
		method public android.telecom.PhoneAccount.Builder setHighlightColor(int);
		method public android.telecom.PhoneAccount.Builder setIcon(android.content.Context, int);
		method public android.telecom.PhoneAccount.Builder setIcon(java.lang.String, int);
		method public android.telecom.PhoneAccount.Builder setIcon(android.content.Context, int, int);
		method public android.telecom.PhoneAccount.Builder setIcon(java.lang.String, int, int);
		method public android.telecom.PhoneAccount.Builder setIcon(android.graphics.Bitmap);
		method public android.telecom.PhoneAccount.Builder setIconBitmap(android.graphics.Bitmap);
		method public android.telecom.PhoneAccount.Builder setIconPackageName(java.lang.String);
		method public android.telecom.PhoneAccount.Builder setShortDescription(java.lang.CharSequence);
		method public android.telecom.PhoneAccount.Builder setSubscriptionAddress(android.net.Uri);
		method public android.telecom.PhoneAccount.Builder setSupportedUriSchemes(java.util.List<java.lang.String>);
		@@ -30281,23 +30258,8 @@ package android.telecom {
		field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccountHandle> CREATOR;
		}

		public final class PhoneCapabilities {
		method public static java.lang.String toString(int);
		field public static final int ALL = 12527; // 0x30ef
		field public static final int DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000
		field public static final int HOLD = 1; // 0x1
		field public static final int MANAGE_CONFERENCE = 128; // 0x80
		field public static final int MERGE_CONFERENCE = 4; // 0x4
		field public static final int MUTE = 64; // 0x40
		field public static final int RESPOND_VIA_TEXT = 32; // 0x20
		field public static final int SEPARATE_FROM_CONFERENCE = 4096; // 0x1000
		field public static final int SUPPORT_HOLD = 2; // 0x2
		field public static final int SWAP_CONFERENCE = 8; // 0x8
		}

		public final class RemoteConference {
		method public void disconnect();
		method public final int getCallProperties();
		method public java.util.List<android.telecom.RemoteConnection> getConferenceableConnections();
		method public final int getConnectionCapabilities();
		method public final java.util.List<android.telecom.RemoteConnection> getConnections();
		@@ -30323,7 +30285,6 @@ package android.telecom {
		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);
		method public void onPropertiesChanged(android.telecom.RemoteConference, int);
		method public void onStateChanged(android.telecom.RemoteConference, int, int);
		}

		@@ -30333,7 +30294,6 @@ package android.telecom {
		method public void disconnect();
		method public android.net.Uri getAddress();
		method public int getAddressPresentation();
		method public int getCallProperties();
		method public java.lang.CharSequence getCallerDisplayName();
		method public int getCallerDisplayNamePresentation();
		method public android.telecom.RemoteConference getConference();
		@@ -30358,7 +30318,6 @@ package android.telecom {
		public static abstract class RemoteConnection.Callback {
		ctor public RemoteConnection.Callback();
		method public void onAddressChanged(android.telecom.RemoteConnection, android.net.Uri, int);
		method public void onCallPropertiesChanged(android.telecom.RemoteConnection, int);
		method public void onCallerDisplayNameChanged(android.telecom.RemoteConnection, java.lang.String, int);
		method public void onConferenceChanged(android.telecom.RemoteConnection, android.telecom.RemoteConference);
		method public void onConferenceableConnectionsChanged(android.telecom.RemoteConnection, java.util.List<android.telecom.RemoteConnection>);
		@@ -30955,7 +30914,6 @@ package android.telephony {
		method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);
		method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);
		method public boolean isDataConnectivityPossible();
		method public boolean isDataPossibleForSubscription(int, java.lang.String);
		method public boolean isIdle();
		method public boolean isNetworkRoaming();
		method public boolean isOffhook();

telecomm/java/android/telecom/Call.java

100644 → 100755

+1 −11

Original line number	Diff line number	Diff line
		@@ -391,6 +391,7 @@ public final class Call {
		/**
		* @return The substate of the {@code Call}.
		*/
		/** @hide */
		public int getCallSubstate() {
		return mCallSubstate;
		}
		@@ -689,17 +690,6 @@ public final class Call {
		mInCallAdapter.phoneAccountSelected(mTelecomCallId, accountHandle);
		}



		/**
		* Notifies this {@code Call} that an account has been selected and to proceed with placing
		* an outgoing call.
		*/
		public void phoneAccountSelected(PhoneAccountHandle accountHandle) {
		mInCallAdapter.phoneAccountSelected(mTelecomCallId, accountHandle);

		}

		/**
		* Instructs this {@code Call} to enter a conference.
		*

telecomm/java/android/telecom/Conference.java

100644 → 100755

+3 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ public abstract class Conference implements IConferenceable {
		*/
		public static long CONNECT_TIME_NOT_SPECIFIED = 0;

		/** @hide */
		public static final long NO_CONNECTTIME = 0;
		/** @hide */
		public abstract static class Listener {
		@@ -217,6 +218,7 @@ public abstract class Conference implements IConferenceable {
		*
		* @param participant The participant to be added with conference call.
		*/
		/** @hide */
		public void onAddParticipant(String participant) {}

		/**
		@@ -392,6 +394,7 @@ public abstract class Conference implements IConferenceable {
		fireOnConferenceableConnectionsChanged();
		}

		/** @hide */
		public final void setVideoState(Connection c, int videoState) {
		Log.d(this, "setVideoState Conference: %s Connection: %s VideoState: %s",
		this, c, videoState);

telecomm/java/android/telecom/Connection.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -71,20 +71,26 @@ public abstract class Connection implements IConferenceable {
		*/

		/* Default case */
		/** @hide */
		public static final int CALL_SUBSTATE_NONE = 0;

		/** @hide */
		/* Indicates that the call is connected but audio attribute is suspended */
		public static final int CALL_SUBSTATE_AUDIO_CONNECTED_SUSPENDED = 0x1;

		/** @hide */
		/* Indicates that the call is connected but video attribute is suspended */
		public static final int CALL_SUBSTATE_VIDEO_CONNECTED_SUSPENDED = 0x2;

		/** @hide */
		/* Indicates that the call is established but media retry is needed */
		public static final int CALL_SUBSTATE_AVP_RETRY = 0x4;

		/** @hide */
		/* Indicates that the call is multitasking */
		public static final int CALL_SUBSTATE_MEDIA_PAUSED = 0x8;

		/** @hide */
		/* Mask containing all the call substate bits set */
		public static final int CALL_SUBSTATE_ALL = CALL_SUBSTATE_AUDIO_CONNECTED_SUSPENDED \|
		CALL_SUBSTATE_VIDEO_CONNECTED_SUSPENDED \| CALL_SUBSTATE_AVP_RETRY \|
		@@ -935,6 +941,8 @@ public abstract class Connection implements IConferenceable {

		/**
		* Returns the connection's {@link CallProperties}
		*
		* @hide
		*/
		public final int getCallProperties() {
		return mCallProperties;
		@@ -1025,6 +1033,7 @@ public abstract class Connection implements IConferenceable {
		/**
		* Updates the call extras for the connection.
		*/
		/** @hide */
		public final void setExtras(Bundle extras) {
		if (DBG) {
		Log.d(this, "setExtras extras size= " + extras.size());
		@@ -1183,6 +1192,8 @@ public abstract class Connection implements IConferenceable {
		* Sets the connection's {@link CallProperties}.
		*
		* @param callProperties The new call properties.
		*
		* @hide
		*/
		public final void setCallProperties(int callProperties) {
		if (mCallProperties != callProperties) {
		@@ -1274,6 +1285,8 @@ public abstract class Connection implements IConferenceable {

		/**
		* Resets the cdma connection time.
		*
		* @hide.
		*/
		public final void resetCdmaConnectionTime() {
		for (Listener l : mListeners) {
		@@ -1487,11 +1500,13 @@ public abstract class Connection implements IConferenceable {
		*
		* @param otherConnection The connection with which this connection should be conferenced.
		*/
		/** @hide */
		public void onConferenceWith(Connection otherConnection) {}

		/**
		* Notifies this Connection that the conference which is set on it has changed.
		*/
		/** @hide */
		public void onConferenceChanged() {}

		static String toLogSafePhoneNumber(String number) {

telecomm/java/android/telecom/ConnectionService.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -1137,6 +1137,7 @@ public abstract class ConnectionService extends Service {
		* Connection is part of a conference controller but is not yet added to Connection
		* Service and hence cannot be added to the conference call.
		*/
		/** @hide */
		public void triggerConferenceRecalculate() {
		}