Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE Remove connection substate" into m-wireless-dev

Browse Source
This commit is contained in:
Jay Shrauner
2015-04-16 23:23:17 +00:00
committed by Android Partner Code Review
parent 7f61051949 6f20a6a2b4
commit 7f22726ff3
11 changed files with 10 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
telecomm/java/android/telecom/Call.java
View File

@@ -233,7 +233,6 @@ public final class Call {
private final int mVideoState;
private final StatusHints mStatusHints;
private final Bundle mExtras;
private final int mCallSubstate;
/**
* Whether the supplied capabilities supports the specified capability.
@@ -430,14 +429,6 @@ public final class Call {
return mExtras;
}
/**
* @return The substate of the {@code Call}.
* @hide
*/
public int getCallSubstate() {
return mCallSubstate;
}
@Override
public boolean equals(Object o) {
if (o instanceof Details) {
@@ -456,8 +447,7 @@ public final class Call {
Objects.equals(mGatewayInfo, d.mGatewayInfo) &&
Objects.equals(mVideoState, d.mVideoState) &&
Objects.equals(mStatusHints, d.mStatusHints) &&
Objects.equals(mExtras, d.mExtras) &&
Objects.equals(mCallSubstate, d.mCallSubstate);
Objects.equals(mExtras, d.mExtras);
}
return false;
}
@@ -477,8 +467,7 @@ public final class Call {
Objects.hashCode(mGatewayInfo) +
Objects.hashCode(mVideoState) +
Objects.hashCode(mStatusHints) +
Objects.hashCode(mExtras) +
Objects.hashCode(mCallSubstate);
Objects.hashCode(mExtras);
}
/** {@hide} */
@@ -495,8 +484,7 @@ public final class Call {
GatewayInfo gatewayInfo,
int videoState,
StatusHints statusHints,
Bundle extras,
int callSubstate) {
Bundle extras) {
mHandle = handle;
mHandlePresentation = handlePresentation;
mCallerDisplayName = callerDisplayName;
@@ -510,7 +498,6 @@ public final class Call {
mVideoState = videoState;
mStatusHints = statusHints;
mExtras = extras;
mCallSubstate = callSubstate;
}
}
@@ -889,8 +876,7 @@ public final class Call {
parcelableCall.getGatewayInfo(),
parcelableCall.getVideoState(),
parcelableCall.getStatusHints(),
parcelableCall.getExtras(),
parcelableCall.getCallSubstate());
parcelableCall.getExtras());
boolean detailsChanged = !Objects.equals(mDetails, details);
if (detailsChanged) {
mDetails = details;

78
telecomm/java/android/telecom/Connection.java
View File

@@ -201,48 +201,6 @@ public abstract class Connection implements IConferenceable {
// Next CAPABILITY value: 0x00200000
//**********************************************************************************************
/**
* Call substate bitmask values
*/
/* Default case */
/**
* @hide
*/
public static final int SUBSTATE_NONE = 0;
/* Indicates that the call is connected but audio attribute is suspended */
/**
* @hide
*/
public static final int SUBSTATE_AUDIO_CONNECTED_SUSPENDED = 0x1;
/* Indicates that the call is connected but video attribute is suspended */
/**
* @hide
*/
public static final int SUBSTATE_VIDEO_CONNECTED_SUSPENDED = 0x2;
/* Indicates that the call is established but media retry is needed */
/**
* @hide
*/
public static final int SUBSTATE_AVP_RETRY = 0x4;
/* Indicates that the call is multitasking */
/**
* @hide
*/
public static final int SUBSTATE_MEDIA_PAUSED = 0x8;
/* Mask containing all the call substate bits set */
/**
* @hide
*/
public static final int SUBSTATE_ALL = SUBSTATE_AUDIO_CONNECTED_SUSPENDED |
SUBSTATE_VIDEO_CONNECTED_SUSPENDED | SUBSTATE_AVP_RETRY |
SUBSTATE_MEDIA_PAUSED;
// Flag controlling whether PII is emitted into the logs
private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);
@@ -381,7 +339,6 @@ public abstract class Connection implements IConferenceable {
public void onConferenceParticipantsChanged(Connection c,
List<ConferenceParticipant> participants) {}
public void onConferenceStarted() {}
public void onCallSubstateChanged(Connection c, int substate) {}
}
public static abstract class VideoProvider {
@@ -852,7 +809,6 @@ public abstract class Connection implements IConferenceable {
private DisconnectCause mDisconnectCause;
private Conference mConference;
private ConnectionService mConnectionService;
private int mCallSubstate;
/**
* Create a new Connection.
@@ -910,21 +866,6 @@ public abstract class Connection implements IConferenceable {
return mVideoState;
}
/**
* Returns the call substate of the call.
* Valid values: {@link Connection#SUBSTATE_NONE},
* {@link Connection#SUBSTATE_AUDIO_CONNECTED_SUSPENDED},
* {@link Connection#SUBSTATE_VIDEO_CONNECTED_SUSPENDED},
* {@link Connection#SUBSTATE_AVP_RETRY},
* {@link Connection#SUBSTATE_MEDIA_PAUSED}.
*
* @param callSubstate The new call substate.
* @hide
*/
public final int getCallSubstate() {
return mCallSubstate;
}
/**
* @return The audio state of the connection, describing how its audio is currently
* being routed by the system. This is {@code null} if this Connection
@@ -1098,25 +1039,6 @@ public abstract class Connection implements IConferenceable {
}
}
/**
* Set the call substate for the connection.
* Valid values: {@link Connection#SUBSTATE_NONE},
* {@link Connection#SUBSTATE_AUDIO_CONNECTED_SUSPENDED},
* {@link Connection#SUBSTATE_VIDEO_CONNECTED_SUSPENDED},
* {@link Connection#SUBSTATE_AVP_RETRY},
* {@link Connection#SUBSTATE_MEDIA_PAUSED}.
*
* @param callSubstate The new call substate.
* @hide
*/
public final void setCallSubstate(int callSubstate) {
Log.d(this, "setCallSubstate %d", callSubstate);
mCallSubstate = callSubstate;
for (Listener l : mListeners) {
l.onCallSubstateChanged(this, mCallSubstate);
}
}
/**
* Sets state to active (e.g., an ongoing connection where two or more parties can actively
* communicate).

12
telecomm/java/android/telecom/ConnectionService.java
View File

@@ -562,13 +562,6 @@ public abstract class ConnectionService extends Service {
mAdapter.setIsConferenced(id, conferenceId);
}
}
@Override
public void onCallSubstateChanged(Connection c, int callSubstate) {
String id = mIdByConnection.get(c);
Log.d(this, "Adapter set call substate %d", callSubstate);
mAdapter.setCallSubstate(id, callSubstate);
}
};
/** {@inheritDoc} */
@@ -638,8 +631,7 @@ public abstract class ConnectionService extends Service {
connection.getAudioModeIsVoip(),
connection.getStatusHints(),
connection.getDisconnectCause(),
createIdList(connection.getConferenceables()),
connection.getCallSubstate()));
createIdList(connection.getConferenceables())));
}
private void abort(String callId) {
@@ -963,7 +955,7 @@ public abstract class ConnectionService extends Service {
connection.getAudioModeIsVoip(),
connection.getStatusHints(),
connection.getDisconnectCause(),
emptyList, connection.getCallSubstate());
emptyList);
mAdapter.addExistingConnection(id, parcelableConnection);
}
}

22
telecomm/java/android/telecom/ConnectionServiceAdapter.java
View File

@@ -369,26 +369,4 @@ final class ConnectionServiceAdapter implements DeathRecipient {
}
}
}
/**
* Set the call substate for the connection.
* Valid values: {@link Connection#CALL_SUBSTATE_NONE},
* {@link Connection#CALL_SUBSTATE_AUDIO_CONNECTED_SUSPENDED},
* {@link Connection#CALL_SUBSTATE_VIDEO_CONNECTED_SUSPENDED},
* {@link Connection#CALL_SUBSTATE_AVP_RETRY},
* {@link Connection#CALL_SUBSTATE_MEDIA_PAUSED}.
*
* @param callId The unique ID of the call to set the substate for.
* @param callSubstate The new call substate.
* @hide
*/
public final void setCallSubstate(String callId, int callSubstate) {
Log.v(this, "setCallSubstate: %d", callSubstate);
for (IConnectionServiceAdapter adapter : mAdapters) {
try {
adapter.setCallSubstate(callId, callSubstate);
} catch (RemoteException ignored) {
}
}
}
}

11
telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
View File

@@ -59,7 +59,6 @@ final class ConnectionServiceAdapterServant {
private static final int MSG_SET_CONFERENCEABLE_CONNECTIONS = 20;
private static final int MSG_ADD_EXISTING_CONNECTION = 21;
private static final int MSG_ON_POST_DIAL_CHAR = 22;
private static final int MSG_SET_CALL_SUBSTATE = 23;
private final IConnectionServiceAdapter mDelegate;
@@ -221,10 +220,6 @@ final class ConnectionServiceAdapterServant {
}
break;
}
case MSG_SET_CALL_SUBSTATE: {
mDelegate.setCallSubstate((String) msg.obj, msg.arg1);
break;
}
}
}
};
@@ -389,12 +384,6 @@ final class ConnectionServiceAdapterServant {
args.arg2 = connection;
mHandler.obtainMessage(MSG_ADD_EXISTING_CONNECTION, args).sendToTarget();
}
@Override
public void setCallSubstate(String connectionId, int callSubstate) {
mHandler.obtainMessage(MSG_SET_CALL_SUBSTATE, callSubstate, 0,
connectionId).sendToTarget();
}
};
public ConnectionServiceAdapterServant(IConnectionServiceAdapter delegate) {

18
telecomm/java/android/telecom/ParcelableCall.java
View File

@@ -55,7 +55,6 @@ public final class ParcelableCall implements Parcelable {
private final int mVideoState;
private final List<String> mConferenceableCallIds;
private final Bundle mExtras;
private int mCallSubstate;
public ParcelableCall(
String id,
@@ -78,8 +77,7 @@ public final class ParcelableCall implements Parcelable {
StatusHints statusHints,
int videoState,
List<String> conferenceableCallIds,
Bundle extras,
int callSubstate) {
Bundle extras) {
mId = id;
mState = state;
mDisconnectCause = disconnectCause;
@@ -101,7 +99,6 @@ public final class ParcelableCall implements Parcelable {
mVideoState = videoState;
mConferenceableCallIds = Collections.unmodifiableList(conferenceableCallIds);
mExtras = extras;
mCallSubstate = callSubstate;
}
/** The unique ID of the call. */
@@ -238,14 +235,6 @@ public final class ParcelableCall implements Parcelable {
return mExtras;
}
/**
* The call substate.
* @return The substate of the call.
*/
public int getCallSubstate() {
return mCallSubstate;
}
/**
* Indicates to the receiver of the {@link ParcelableCall} whether a change has occurred in the
* {@link android.telecom.InCallService.VideoCall} associated with this call. Since
@@ -289,7 +278,6 @@ public final class ParcelableCall implements Parcelable {
List<String> conferenceableCallIds = new ArrayList<>();
source.readList(conferenceableCallIds, classLoader);
Bundle extras = source.readParcelable(classLoader);
int callSubstate = source.readInt();
return new ParcelableCall(
id,
state,
@@ -311,8 +299,7 @@ public final class ParcelableCall implements Parcelable {
statusHints,
videoState,
conferenceableCallIds,
extras,
callSubstate);
extras);
}
@Override
@@ -352,7 +339,6 @@ public final class ParcelableCall implements Parcelable {
destination.writeInt(mVideoState);
destination.writeList(mConferenceableCallIds);
destination.writeParcelable(mExtras, 0);
destination.writeInt(mCallSubstate);
}
@Override

14
telecomm/java/android/telecom/ParcelableConnection.java
View File

@@ -46,7 +46,6 @@ public final class ParcelableConnection implements Parcelable {
private final StatusHints mStatusHints;
private final DisconnectCause mDisconnectCause;
private final List<String> mConferenceableConnectionIds;
private final int mCallSubstate;
/** @hide */
public ParcelableConnection(
@@ -63,8 +62,7 @@ public final class ParcelableConnection implements Parcelable {
boolean isVoipAudioMode,
StatusHints statusHints,
DisconnectCause disconnectCause,
List<String> conferenceableConnectionIds,
int callSubstate) {
List<String> conferenceableConnectionIds) {
mPhoneAccount = phoneAccount;
mState = state;
mConnectionCapabilities = capabilities;
@@ -79,7 +77,6 @@ public final class ParcelableConnection implements Parcelable {
mStatusHints = statusHints;
mDisconnectCause = disconnectCause;
this.mConferenceableConnectionIds = conferenceableConnectionIds;
mCallSubstate = callSubstate;
}
public PhoneAccountHandle getPhoneAccount() {
@@ -139,10 +136,6 @@ public final class ParcelableConnection implements Parcelable {
return mConferenceableConnectionIds;
}
public int getCallSubstate() {
return mCallSubstate;
}
@Override
public String toString() {
return new StringBuilder()
@@ -177,7 +170,6 @@ public final class ParcelableConnection implements Parcelable {
DisconnectCause disconnectCause = source.readParcelable(classLoader);
List<String> conferenceableConnectionIds = new ArrayList<>();
source.readStringList(conferenceableConnectionIds);
int callSubstate = source.readInt();
return new ParcelableConnection(
phoneAccount,
@@ -193,8 +185,7 @@ public final class ParcelableConnection implements Parcelable {
audioModeIsVoip,
statusHints,
disconnectCause,
conferenceableConnectionIds,
callSubstate);
conferenceableConnectionIds);
}
@Override
@@ -227,6 +218,5 @@ public final class ParcelableConnection implements Parcelable {
destination.writeParcelable(mStatusHints, 0);
destination.writeParcelable(mDisconnectCause, 0);
destination.writeStringList(mConferenceableConnectionIds);
destination.writeInt(mCallSubstate);
}
}

30
telecomm/java/android/telecom/RemoteConnection.java
View File

@@ -152,16 +152,6 @@ public final class RemoteConnection {
*/
public void onVideoStateChanged(RemoteConnection connection, int videoState) {}
/**
* Indicates that the call substate of this {@code RemoteConnection} has changed.
* See {@link #getCallSubstate()}.
*
* @param connection The {@code RemoteConnection} invoking this method.
* @param callSubstate The new call substate of the {@code RemoteConnection}.
* @hide
*/
public void onCallSubstateChanged(RemoteConnection connection, int callSubstate) {}
/**
* Indicates that this {@code RemoteConnection} has been destroyed. No further requests
* should be made to the {@code RemoteConnection}, and references to it should be cleared.
@@ -414,7 +404,6 @@ public final class RemoteConnection {
private boolean mConnected;
private int mConnectionCapabilities;
private int mVideoState;
private int mCallSubstate;
private VideoProvider mVideoProvider;
private boolean mIsVoipAudioMode;
private StatusHints mStatusHints;
@@ -594,15 +583,6 @@ public final class RemoteConnection {
return mVideoState;
}
/**
*
* @return The call substate of the {@code RemoteConnection}. See
* @hide
*/
public int getCallSubstate() {
return mCallSubstate;
}
/**
* Obtains the video provider of this {@code RemoteConnection}.
* @return The video provider associated with this {@code RemoteConnection}.
@@ -913,16 +893,6 @@ public final class RemoteConnection {
}
}
/**
* @hide
*/
void setCallSubstate(int callSubstate) {
mCallSubstate = callSubstate;
for (Callback c : mCallbacks) {
c.onCallSubstateChanged(this, callSubstate);
}
}
/**
* @hide
*/

7
telecomm/java/android/telecom/RemoteConnectionService.java
View File

@@ -79,7 +79,6 @@ final class RemoteConnectionService {
}
connection.setConferenceableConnections(conferenceable);
connection.setVideoState(parcel.getVideoState());
connection.setCallSubstate(parcel.getCallSubstate());
if (connection.getState() == Connection.STATE_DISCONNECTED) {
// ... then, if it was created in a disconnected state, that indicates
// failure on the providing end, so immediately mark it destroyed
@@ -307,12 +306,6 @@ final class RemoteConnectionService {
mOurConnectionServiceImpl.addRemoteExistingConnection(remoteConnction);
}
@Override
public void setCallSubstate(String callId, int callSubstate) {
findConnectionForAction(callId, "callSubstate")
.setCallSubstate(callSubstate);
}
};
private final ConnectionServiceAdapterServant mServant =

2
telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl
View File

@@ -81,6 +81,4 @@ oneway interface IConnectionServiceAdapter {
void setConferenceableConnections(String callId, in List<String> conferenceableCallIds);
void addExistingConnection(String callId, in ParcelableConnection connection);
void setCallSubstate(String callId, int callSubstate);
}

7
telephony/java/com/android/ims/internal/IImsCallSession.aidl
View File

@@ -255,11 +255,4 @@ interface IImsCallSession {
* @return {@code True} if the session is multiparty.
*/
boolean isMultiparty();
/**
* Gets the call substate for this session.
*
* @return the call substate for this session.
*/
int getCallSubstate();
}