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

DO NOT MERGE Remove connection substate

Browse Source 
Bug:20300433
Change-Id: Ifefc08b5165de3e0b6ce92007e5f612879dcc4d9
This commit is contained in:
Jay Shrauner
2015-04-16 12:52:19 -07:00
parent c8769de831
commit 6f20a6a2b4
11 changed files with 10 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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).