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

Merge "Updating APIs for CDMA conference call support." into lmp-dev

Browse Source
This commit is contained in:
Santos Cordon
2014-09-05 23:46:08 +00:00
committed by Android (Google) Code Review
parent e9921370d7 a48680427e
commit f7c8b58e84
9 changed files with 123 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/current.txt
View File

@@ -28231,17 +28231,19 @@ package android.telecomm {
public abstract class Conference {
ctor public Conference(android.telecomm.PhoneAccountHandle);
method public boolean addConnection(android.telecomm.Connection);
method public void destroy();
method public final boolean addConnection(android.telecomm.Connection);
method public final void destroy();
method public final int getCapabilities();
method public final java.util.List<android.telecomm.Connection> getConnections();
method public final android.telecomm.PhoneAccountHandle getPhoneAccount();
method public final int getState();
method public void onDisconnect();
method public void onHold();
method public void onMerge();
method public void onSeparate(android.telecomm.Connection);
method public void onSwap();
method public void onUnhold();
method public void removeConnection(android.telecomm.Connection);
method public final void removeConnection(android.telecomm.Connection);
method public final void setActive();
method public final void setCapabilities(int);
method public final void setDisconnected(int, java.lang.String);
@@ -28392,13 +28394,13 @@ package android.telecomm {
method public static java.lang.String toString(int);
field public static final int ADD_CALL = 16; // 0x10
field public static final int ALL = 255; // 0xff
field public static final int GENERIC_CONFERENCE = 128; // 0x80
field public static final int HOLD = 1; // 0x1
field public static final int MERGE_CALLS = 4; // 0x4
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 SUPPORT_HOLD = 2; // 0x2
field public static final int SWAP_CALLS = 8; // 0x8
field public static final int SWAP_CONFERENCE = 8; // 0x8
}
public class PropertyPresentation {

14
telecomm/java/android/telecomm/Call.java
View File

@@ -516,6 +516,20 @@ public final class Call {
mInCallAdapter.splitFromConference(mTelecommCallId);
}
/**
* Merges the calls within this conference. See {@link PhoneCapabilities#MERGE_CONFERENCE}.
*/
public void mergeConference() {
mInCallAdapter.mergeConference(mTelecommCallId);
}
/**
* Swaps the calls within this conference. See {@link PhoneCapabilities#SWAP_CONFERENCE}.
*/
public void swapConference() {
mInCallAdapter.swapConference(mTelecommCallId);
}
/**
* Obtains the parent of this {@code Call} in a conference, if any.
*

18
telecomm/java/android/telecomm/Conference.java
View File

@@ -92,6 +92,18 @@ public abstract class Conference {
*/
public void onUnhold() {}
/**
* Invoked when the child calls should be merged. Only invoked if the conference contains the
* capability {@link PhoneCapabilities#MERGE_CONFERENCE}.
*/
public void onMerge() {}
/**
* Invoked when the child calls should be swapped. Only invoked if the conference contains the
* capability {@link PhoneCapabilities#SWAP_CONFERENCE}.
*/
public void onSwap() {}
/**
* Sets state to be on hold.
*/
@@ -141,7 +153,7 @@ public abstract class Conference {
* @param connection The connection to add.
* @return True if the connection was successfully added.
*/
public boolean addConnection(Connection connection) {
public final boolean addConnection(Connection connection) {
if (connection != null && !mChildConnections.contains(connection)) {
if (connection.setConference(this)) {
mChildConnections.add(connection);
@@ -160,7 +172,7 @@ public abstract class Conference {
* @param connection The connection to remove.
* @return True if the connection was successfully removed.
*/
public void removeConnection(Connection connection) {
public final void removeConnection(Connection connection) {
Log.d(this, "removing %s from %s", connection, mChildConnections);
if (connection != null && mChildConnections.remove(connection)) {
connection.resetConference();
@@ -173,7 +185,7 @@ public abstract class Conference {
/**
* Tears down the conference object and any of it's current connections.
*/
public void destroy() {
public final void destroy() {
Log.d(this, "destroying conference : %s", this);
// Tear down the children.
for (Connection connection : mChildConnections) {

2
telecomm/java/android/telecomm/Connection.java
View File

@@ -1068,10 +1068,10 @@ public abstract class Connection {
if (mState != state) {
Log.d(this, "setState: %s", stateToString(state));
mState = state;
onSetState(state);
for (Listener l : mListeners) {
l.onStateChanged(this, state);
}
onSetState(state);
}
}

34
telecomm/java/android/telecomm/ConnectionService.java
View File

@@ -72,6 +72,8 @@ public abstract class ConnectionService extends Service {
private static final int MSG_ON_PHONE_ACCOUNT_CLICKED = 15;
private static final int MSG_REMOVE_CONNECTION_SERVICE_ADAPTER = 16;
private static final int MSG_ANSWER_VIDEO = 17;
private static final int MSG_MERGE_CONFERENCE = 18;
private static final int MSG_SWAP_CONFERENCE = 19;
private static Connection sNullConnection;
@@ -181,6 +183,16 @@ public abstract class ConnectionService extends Service {
mHandler.obtainMessage(MSG_SPLIT_FROM_CONFERENCE, callId).sendToTarget();
}
@Override
public void mergeConference(String callId) {
mHandler.obtainMessage(MSG_MERGE_CONFERENCE, callId).sendToTarget();
}
@Override
public void swapConference(String callId) {
mHandler.obtainMessage(MSG_SWAP_CONFERENCE, callId).sendToTarget();
}
@Override
public void onPostDialContinue(String callId, boolean proceed) {
SomeArgs args = SomeArgs.obtain();
@@ -298,6 +310,12 @@ public abstract class ConnectionService extends Service {
case MSG_SPLIT_FROM_CONFERENCE:
splitFromConference((String) msg.obj);
break;
case MSG_MERGE_CONFERENCE:
mergeConference((String) msg.obj);
break;
case MSG_SWAP_CONFERENCE:
swapConference((String) msg.obj);
break;
case MSG_ON_POST_DIAL_CONTINUE: {
SomeArgs args = (SomeArgs) msg.obj;
try {
@@ -639,6 +657,22 @@ public abstract class ConnectionService extends Service {
}
}
private void mergeConference(String callId) {
Log.d(this, "mergeConference(%s)", callId);
Conference conference = findConferenceForAction(callId, "mergeConference");
if (conference != null) {
conference.onMerge();
}
}
private void swapConference(String callId) {
Log.d(this, "swapConference(%s)", callId);
Conference conference = findConferenceForAction(callId, "swapConference");
if (conference != null) {
conference.onSwap();
}
}
private void onPostDialContinue(String callId, boolean proceed) {
Log.d(this, "onPostDialContinue(%s)", callId);
findConnectionForAction(callId, "stopDtmfTone").onPostDialContinue(proceed);

20
telecomm/java/android/telecomm/InCallAdapter.java
View File

@@ -240,6 +240,26 @@ public final class InCallAdapter {
}
}
/**
* Instructs Telecomm to merge child calls of the specified conference call.
*/
public void mergeConference(String callId) {
try {
mAdapter.mergeConference(callId);
} catch (RemoteException ignored) {
}
}
/**
* Instructs Telecomm to swap the child calls of the specified conference call.
*/
public void swapConference(String callId) {
try {
mAdapter.swapConference(callId);
} catch (RemoteException ignored) {
}
}
/**
* Instructs Telecomm to turn the proximity sensor on.
*/

37
telecomm/java/android/telecomm/PhoneCapabilities.java
View File

@@ -27,11 +27,17 @@ public final class PhoneCapabilities {
/** Call supports the hold feature. */
public static final int SUPPORT_HOLD = 0x00000002;
/** Call can currently be merged. */
public static final int MERGE_CALLS = 0x00000004;
/**
* Calls within a conference can be merged. Some connection services create a conference call
* only after two calls have been merged. However, a conference call can also be added the
* moment there are more than one call. CDMA calls are implemented in this way because the call
* actions are more limited when more than one call exists. This flag allows merge to be exposed
* as a capability on the conference call instead of individual calls.
*/
public static final int MERGE_CONFERENCE = 0x00000004;
/** Call can currently be swapped with another call. */
public static final int SWAP_CALLS = 0x00000008;
/** Calls withing a conference can be swapped between foreground and background. */
public static final int SWAP_CONFERENCE = 0x00000008;
/** Call currently supports adding another call to this one. */
public static final int ADD_CALL = 0x00000010;
@@ -42,8 +48,11 @@ public final class PhoneCapabilities {
/** Call can be muted. */
public static final int MUTE = 0x00000040;
/** Call supports generic conference mode. */
public static final int GENERIC_CONFERENCE = 0x00000080;
/**
* Call supports conference call management. This capability only applies to conference calls
* which can have other calls as children.
*/
public static final int MANAGE_CONFERENCE = 0x00000080;
/**
* Local device supports video telephony.
@@ -69,8 +78,8 @@ public final class PhoneCapabilities {
*/
public static final int VoWIFI = 0x00000800;
public static final int ALL = HOLD | SUPPORT_HOLD | MERGE_CALLS | SWAP_CALLS | ADD_CALL
| RESPOND_VIA_TEXT | MUTE | GENERIC_CONFERENCE;
public static final int ALL = HOLD | SUPPORT_HOLD | MERGE_CONFERENCE | SWAP_CONFERENCE | ADD_CALL
| RESPOND_VIA_TEXT | MUTE | MANAGE_CONFERENCE;
public static String toString(int capabilities) {
StringBuilder builder = new StringBuilder();
@@ -81,11 +90,11 @@ public final class PhoneCapabilities {
if ((capabilities & SUPPORT_HOLD) != 0) {
builder.append(" SUPPORT_HOLD");
}
if ((capabilities & MERGE_CALLS) != 0) {
builder.append(" MERGE_CALLS");
if ((capabilities & MERGE_CONFERENCE) != 0) {
builder.append(" MERGE_CONFERENCE");
}
if ((capabilities & SWAP_CALLS) != 0) {
builder.append(" SWAP_CALLS");
if ((capabilities & SWAP_CONFERENCE) != 0) {
builder.append(" SWAP_CONFERENCE");
}
if ((capabilities & ADD_CALL) != 0) {
builder.append(" ADD_CALL");
@@ -96,8 +105,8 @@ public final class PhoneCapabilities {
if ((capabilities & MUTE) != 0) {
builder.append(" MUTE");
}
if ((capabilities & GENERIC_CONFERENCE) != 0) {
builder.append(" GENERIC_CONFERENCE");
if ((capabilities & MANAGE_CONFERENCE) != 0) {
builder.append(" MANAGE_CONFERENCE");
}
if ((capabilities & SUPPORTS_VT_LOCAL) != 0) {
builder.append(" SUPPORTS_VT_LOCAL");

4
telecomm/java/com/android/internal/telecomm/IConnectionService.aidl
View File

@@ -65,6 +65,10 @@ oneway interface IConnectionService {
void splitFromConference(String callId);
void mergeConference(String conferenceCallId);
void swapConference(String conferenceCallId);
void onPostDialContinue(String callId, boolean proceed);
void onPhoneAccountClicked(String callId);

4
telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl
View File

@@ -54,6 +54,10 @@ oneway interface IInCallAdapter {
void splitFromConference(String callId);
void mergeConference(String callId);
void swapConference(String callId);
void turnOnProximitySensor();
void turnOffProximitySensor(boolean screenOnImmediately);