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

Add hold support to frameworks/base/telecomm

Browse Source 
Bug: 13169202

Change-Id: Ib01990c1f8654f95a4cfcca4a91f0ab143722d8e
This commit is contained in:
Yorke Lee
2014-03-12 18:33:19 -07:00
parent da153a44c0
commit 81ccaaa25c
10 changed files with 149 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/current.txt
View File

@@ -24455,11 +24455,13 @@ package android.telecomm {
method public abstract void call(android.telecomm.CallInfo);
method public abstract void disconnect(java.lang.String);
method public final android.os.IBinder getBinder();
method public abstract void hold(java.lang.String);
method public abstract void isCompatibleWith(android.telecomm.CallInfo);
method public final android.os.IBinder onBind(android.content.Intent);
method public abstract void reject(java.lang.String);
method public abstract void setCallServiceAdapter(android.telecomm.CallServiceAdapter);
method public abstract void setIncomingCallId(java.lang.String, android.os.Bundle);
method public abstract void unhold(java.lang.String);
}
public final class CallServiceAdapter {
@@ -24470,6 +24472,7 @@ package android.telecomm {
method public void setDialing(java.lang.String);
method public void setDisconnected(java.lang.String);
method public void setIsCompatibleWith(java.lang.String, boolean);
method public void setOnHold(java.lang.String);
method public void setRinging(java.lang.String);
}
@@ -24523,13 +24526,16 @@ package android.telecomm {
enum_constant public static final android.telecomm.CallState ACTIVE;
enum_constant public static final android.telecomm.CallState DIALING;
enum_constant public static final android.telecomm.CallState DISCONNECTED;
enum_constant public static final android.telecomm.CallState ON_HOLD;
enum_constant public static final android.telecomm.CallState RINGING;
}
public final class InCallAdapter {
method public void answerCall(java.lang.String);
method public void disconnectCall(java.lang.String);
method public void holdCall(java.lang.String);
method public void rejectCall(java.lang.String);
method public void unholdCall(java.lang.String);
}
public abstract class InCallService extends android.app.Service {
@@ -24539,6 +24545,7 @@ package android.telecomm {
method protected abstract void setActive(java.lang.String);
method protected abstract void setDisconnected(java.lang.String);
method protected abstract void setInCallAdapter(android.telecomm.InCallAdapter);
method protected abstract void setOnHold(java.lang.String);
}
public final class TelecommConstants {

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

@@ -86,6 +86,12 @@ public abstract class CallService extends Service {
case MSG_DISCONNECT:
disconnect((String) msg.obj);
break;
case MSG_HOLD:
hold((String) msg.obj);
break;
case MSG_UNHOLD:
unhold((String) msg.obj);
break;
default:
break;
}
@@ -139,6 +145,16 @@ public abstract class CallService extends Service {
public void disconnect(String callId) {
mMessageHandler.obtainMessage(MSG_DISCONNECT, callId).sendToTarget();
}
@Override
public void hold(String callId) {
mMessageHandler.obtainMessage(MSG_HOLD, callId).sendToTarget();
}
@Override
public void unhold(String callId) {
mMessageHandler.obtainMessage(MSG_UNHOLD, callId).sendToTarget();
}
}
// Only used internally by this class.
@@ -154,7 +170,9 @@ public abstract class CallService extends Service {
MSG_SET_INCOMING_CALL_ID = 5,
MSG_ANSWER = 6,
MSG_REJECT = 7,
MSG_DISCONNECT = 8;
MSG_DISCONNECT = 8,
MSG_HOLD = 9,
MSG_UNHOLD = 10;
/**
* Message handler for consolidating binder callbacks onto a single thread.
@@ -258,4 +276,18 @@ public abstract class CallService extends Service {
* @param callId The ID of the call to disconnect.
*/
public abstract void disconnect(String callId);
/**
* Puts the specified call on hold.
*
* @param callId The ID of the call to put on hold.
*/
public abstract void hold(String callId);
/**
* Removes the specified call from hold.
*
* @param callId The ID of the call to unhold.
*/
public abstract void unhold(String callId);
}

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

@@ -140,4 +140,18 @@ public final class CallServiceAdapter {
} catch (RemoteException e) {
}
}
/**
* Sets a call's state to be on hold.
*
* @param callId - The unique ID of the call whose state is changing to be on hold.
*/
public void setOnHold(String callId) {
try {
mAdapter.setOnHold(callId);
} catch (RemoteException e) {
}
}
}

8
telecomm/java/android/telecomm/CallState.java
View File

@@ -55,6 +55,14 @@ public enum CallState {
*/
ACTIVE,
/**
* Indicates that the call is currently on hold. In this state, the call is not terminated
* but no communication is allowed until the call is no longer on hold. The typical transition
* to this state is by the user putting an {@link #ACTIVE} call on hold by explicitly performing
* an action, such as clicking the hold button.
*/
ON_HOLD,
/**
* Indicates that a call is currently disconnected. All states can transition to this state
* by the call service giving notice that the connection has been severed. When the user

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

@@ -78,4 +78,28 @@ public final class InCallAdapter {
} catch (RemoteException e) {
}
}
/**
* Instructs Telecomm to put the specified call on hold.
*
* @param callId The identifier of the call to put on hold.
*/
public void holdCall(String callId) {
try {
mAdapter.holdCall(callId);
} catch (RemoteException e) {
}
}
/**
* Instructs Telecomm to release the specified call from hold.
*
* @param callId The identifier of the call to release from hold.
*/
public void unholdCall(String callId) {
try {
mAdapter.unholdCall(callId);
} catch (RemoteException e) {
}
}
}

17
telecomm/java/android/telecomm/InCallService.java
View File

@@ -39,6 +39,7 @@ public abstract class InCallService extends Service {
private static final int MSG_ADD_CALL = 2;
private static final int MSG_SET_ACTIVE = 3;
private static final int MSG_SET_DISCONNECTED = 4;
private static final int MSG_SET_HOLD = 5;
/** Default Handler used to consolidate binder method calls onto a single thread. */
private final Handler mHandler = new Handler(Looper.getMainLooper()) {
@@ -58,6 +59,8 @@ public abstract class InCallService extends Service {
case MSG_SET_DISCONNECTED:
setDisconnected((String) msg.obj);
break;
case MSG_SET_HOLD:
setOnHold((String) msg.obj);
default:
break;
}
@@ -89,6 +92,12 @@ public abstract class InCallService extends Service {
public void setDisconnected(String callId) {
mHandler.obtainMessage(MSG_SET_DISCONNECTED, callId).sendToTarget();
}
/** {@inheritDoc} */
@Override
public void setOnHold(String callId) {
mHandler.obtainMessage(MSG_SET_HOLD, callId).sendToTarget();
}
}
private final InCallServiceBinder mBinder;
@@ -136,4 +145,12 @@ public abstract class InCallService extends Service {
* @param callId The identifier of the call that was disconnected.
*/
protected abstract void setDisconnected(String callId);
/**
* Indicates to the in-call app that a call has been moved to the
* {@link android.telecomm.CallState#ON_HOLD} state and the user should be notified.
*
* @param callId The identifier of the call that was put on hold.
*/
protected abstract void setOnHold(String callId);
}

18
telecomm/java/com/android/internal/telecomm/ICallService.aidl
View File

@@ -39,7 +39,7 @@ oneway interface ICallService {
/**
* Sets an implementation of ICallServiceAdapter which the call service can use to add new calls
* and communicate state changes of existing calls. This is the first method that is called
* after a the framework binds to the call service.
* after the framework binds to the call service.
*
* @param callServiceAdapter Interface to CallsManager for adding and updating calls.
*/
@@ -120,4 +120,20 @@ oneway interface ICallService {
* @param callId The identifier of the call to disconnect.
*/
void disconnect(String callId);
/**
* Puts the call identified by callId on hold. Telecomm invokes this method when a call should
* be placed on hold per user request or because a different call was made active.
*
* @param callId The identifier of the call to put on hold.
*/
void hold(String callId);
/**
* Removes the call identified by callId from hold. Telecomm invokes this method when a call
* should be removed on hold per user request or because a different call was put on hold.
*
* @param callId The identifier of the call to remove from hold.
*/
void unhold(String callId);
}

7
telecomm/java/com/android/internal/telecomm/ICallServiceAdapter.aidl
View File

@@ -91,4 +91,11 @@ oneway interface ICallServiceAdapter {
* @param callId The unique ID of the call whose state is changing to disconnected.
*/
void setDisconnected(String callId);
/**
* Sets a call's state to be on hold.
*
* @param callId The unique ID of the call whose state is changing to be on hold.
*/
void setOnHold(String callId);
}

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

@@ -53,4 +53,18 @@ oneway interface IInCallAdapter {
* @param callId The identifier of the call to disconnect.
*/
void disconnectCall(String callId);
/**
* Instructs Telecomm to put the specified call on hold.
*
* @param callId The identifier of the call to put on hold.
*/
void holdCall(String callId);
/**
* Instructs Telecomm to release the specified call from hold.
*
* @param callId The identifier of the call to release from hold.
*/
void unholdCall(String callId);
}

8
telecomm/java/com/android/internal/telecomm/IInCallService.aidl
View File

@@ -66,4 +66,12 @@ oneway interface IInCallService {
* @param callId The identifier of the call that was disconnected.
*/
void setDisconnected(String callId);
/**
* Indicates to the in-call app that a call has been moved to the
* {@link android.telecomm.CallState#HOLD} state and the user should be notified.
*
* @param callId The identifier of the call that was put on hold.
*/
void setOnHold(String callId);
}