Merge "Remove Session ID from ImsService APIs that do not need it."
am: 975be6c065
Change-Id: I09469d99bc68133a4de594507854c269e905c40e
This commit is contained in:
@@ -128,23 +128,23 @@ public abstract class ImsService extends ImsServiceBase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isConnected(int slotId, int featureType, int sessionId, int callSessionType,
|
public boolean isConnected(int slotId, int featureType, int callSessionType, int callType)
|
||||||
int callType) throws RemoteException {
|
throws RemoteException {
|
||||||
synchronized (mFeatures) {
|
synchronized (mFeatures) {
|
||||||
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
||||||
if (feature != null) {
|
if (feature != null) {
|
||||||
return feature.isConnected(sessionId, callSessionType, callType);
|
return feature.isConnected(callSessionType, callType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isOpened(int slotId, int featureType, int sessionId) throws RemoteException {
|
public boolean isOpened(int slotId, int featureType) throws RemoteException {
|
||||||
synchronized (mFeatures) {
|
synchronized (mFeatures) {
|
||||||
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
||||||
if (feature != null) {
|
if (feature != null) {
|
||||||
return feature.isOpened(sessionId);
|
return feature.isOpened();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@@ -166,23 +166,23 @@ public abstract class ImsService extends ImsServiceBase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addRegistrationListener(int slotId, int featureType, int sessionId,
|
public void addRegistrationListener(int slotId, int featureType,
|
||||||
IImsRegistrationListener listener) throws RemoteException {
|
IImsRegistrationListener listener) throws RemoteException {
|
||||||
synchronized (mFeatures) {
|
synchronized (mFeatures) {
|
||||||
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
||||||
if (feature != null) {
|
if (feature != null) {
|
||||||
feature.addRegistrationListener(sessionId, listener);
|
feature.addRegistrationListener(listener);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void removeRegistrationListener(int slotId, int featureType, int sessionId,
|
public void removeRegistrationListener(int slotId, int featureType,
|
||||||
IImsRegistrationListener listener) throws RemoteException {
|
IImsRegistrationListener listener) throws RemoteException {
|
||||||
synchronized (mFeatures) {
|
synchronized (mFeatures) {
|
||||||
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
||||||
if (feature != null) {
|
if (feature != null) {
|
||||||
feature.removeRegistrationListener(sessionId, listener);
|
feature.removeRegistrationListener(listener);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -224,79 +224,79 @@ public abstract class ImsService extends ImsServiceBase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IImsUt getUtInterface(int slotId, int featureType, int sessionId)
|
public IImsUt getUtInterface(int slotId, int featureType)
|
||||||
throws RemoteException {
|
throws RemoteException {
|
||||||
synchronized (mFeatures) {
|
synchronized (mFeatures) {
|
||||||
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
||||||
if (feature != null) {
|
if (feature != null) {
|
||||||
return feature.getUtInterface(sessionId);
|
return feature.getUtInterface();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IImsConfig getConfigInterface(int slotId, int featureType, int sessionId)
|
public IImsConfig getConfigInterface(int slotId, int featureType)
|
||||||
throws RemoteException {
|
throws RemoteException {
|
||||||
synchronized (mFeatures) {
|
synchronized (mFeatures) {
|
||||||
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
||||||
if (feature != null) {
|
if (feature != null) {
|
||||||
return feature.getConfigInterface(sessionId);
|
return feature.getConfigInterface();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void turnOnIms(int slotId, int featureType, int sessionId) throws RemoteException {
|
public void turnOnIms(int slotId, int featureType) throws RemoteException {
|
||||||
synchronized (mFeatures) {
|
synchronized (mFeatures) {
|
||||||
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
||||||
if (feature != null) {
|
if (feature != null) {
|
||||||
feature.turnOnIms(sessionId);
|
feature.turnOnIms();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void turnOffIms(int slotId, int featureType, int sessionId) throws RemoteException {
|
public void turnOffIms(int slotId, int featureType) throws RemoteException {
|
||||||
synchronized (mFeatures) {
|
synchronized (mFeatures) {
|
||||||
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
||||||
if (feature != null) {
|
if (feature != null) {
|
||||||
feature.turnOffIms(sessionId);
|
feature.turnOffIms();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IImsEcbm getEcbmInterface(int slotId, int featureType, int sessionId)
|
public IImsEcbm getEcbmInterface(int slotId, int featureType)
|
||||||
throws RemoteException {
|
throws RemoteException {
|
||||||
synchronized (mFeatures) {
|
synchronized (mFeatures) {
|
||||||
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
||||||
if (feature != null) {
|
if (feature != null) {
|
||||||
return feature.getEcbmInterface(sessionId);
|
return feature.getEcbmInterface();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setUiTTYMode(int slotId, int featureType, int sessionId, int uiTtyMode,
|
public void setUiTTYMode(int slotId, int featureType, int uiTtyMode, Message onComplete)
|
||||||
Message onComplete) throws RemoteException {
|
throws RemoteException {
|
||||||
synchronized (mFeatures) {
|
synchronized (mFeatures) {
|
||||||
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
||||||
if (feature != null) {
|
if (feature != null) {
|
||||||
feature.setUiTTYMode(sessionId, uiTtyMode, onComplete);
|
feature.setUiTTYMode(uiTtyMode, onComplete);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IImsMultiEndpoint getMultiEndpointInterface(int slotId, int featureType,
|
public IImsMultiEndpoint getMultiEndpointInterface(int slotId, int featureType)
|
||||||
int sessionId) throws RemoteException {
|
throws RemoteException {
|
||||||
synchronized (mFeatures) {
|
synchronized (mFeatures) {
|
||||||
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
MMTelFeature feature = resolveMMTelFeature(slotId, featureType);
|
||||||
if (feature != null) {
|
if (feature != null) {
|
||||||
return feature.getMultiEndpointInterface(sessionId);
|
return feature.getMultiEndpointInterface();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -135,40 +135,40 @@ public class ImsServiceProxy extends ImsServiceProxyCompat implements IRcsFeatur
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isConnected(int sessionId, int callServiceType, int callType)
|
public boolean isConnected(int callServiceType, int callType)
|
||||||
throws RemoteException {
|
throws RemoteException {
|
||||||
synchronized (mLock) {
|
synchronized (mLock) {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
return getServiceInterface(mBinder).isConnected(mSlotId, mSupportedFeature, sessionId,
|
return getServiceInterface(mBinder).isConnected(mSlotId, mSupportedFeature,
|
||||||
callServiceType, callType);
|
callServiceType, callType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isOpened(int sessionId) throws RemoteException {
|
public boolean isOpened() throws RemoteException {
|
||||||
synchronized (mLock) {
|
synchronized (mLock) {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
return getServiceInterface(mBinder).isOpened(mSlotId, mSupportedFeature, sessionId);
|
return getServiceInterface(mBinder).isOpened(mSlotId, mSupportedFeature);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addRegistrationListener(int sessionId, IImsRegistrationListener listener)
|
public void addRegistrationListener(IImsRegistrationListener listener)
|
||||||
throws RemoteException {
|
throws RemoteException {
|
||||||
synchronized (mLock) {
|
synchronized (mLock) {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
getServiceInterface(mBinder).addRegistrationListener(mSlotId, mSupportedFeature,
|
getServiceInterface(mBinder).addRegistrationListener(mSlotId, mSupportedFeature,
|
||||||
sessionId, listener);
|
listener);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void removeRegistrationListener(int sessionId, IImsRegistrationListener listener)
|
public void removeRegistrationListener(IImsRegistrationListener listener)
|
||||||
throws RemoteException {
|
throws RemoteException {
|
||||||
synchronized (mLock) {
|
synchronized (mLock) {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
getServiceInterface(mBinder).removeRegistrationListener(mSlotId, mSupportedFeature,
|
getServiceInterface(mBinder).removeRegistrationListener(mSlotId, mSupportedFeature,
|
||||||
sessionId, listener);
|
listener);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -203,64 +203,61 @@ public class ImsServiceProxy extends ImsServiceProxyCompat implements IRcsFeatur
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IImsUt getUtInterface(int sessionId) throws RemoteException {
|
public IImsUt getUtInterface() throws RemoteException {
|
||||||
synchronized (mLock) {
|
synchronized (mLock) {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
return getServiceInterface(mBinder).getUtInterface(mSlotId, mSupportedFeature,
|
return getServiceInterface(mBinder).getUtInterface(mSlotId, mSupportedFeature);
|
||||||
sessionId);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IImsConfig getConfigInterface(int sessionId) throws RemoteException {
|
public IImsConfig getConfigInterface() throws RemoteException {
|
||||||
synchronized (mLock) {
|
synchronized (mLock) {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
return getServiceInterface(mBinder).getConfigInterface(mSlotId, mSupportedFeature,
|
return getServiceInterface(mBinder).getConfigInterface(mSlotId, mSupportedFeature);
|
||||||
sessionId);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void turnOnIms(int sessionId) throws RemoteException {
|
public void turnOnIms() throws RemoteException {
|
||||||
synchronized (mLock) {
|
synchronized (mLock) {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
getServiceInterface(mBinder).turnOnIms(mSlotId, mSupportedFeature, sessionId);
|
getServiceInterface(mBinder).turnOnIms(mSlotId, mSupportedFeature);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void turnOffIms(int sessionId) throws RemoteException {
|
public void turnOffIms() throws RemoteException {
|
||||||
synchronized (mLock) {
|
synchronized (mLock) {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
getServiceInterface(mBinder).turnOffIms(mSlotId, mSupportedFeature, sessionId);
|
getServiceInterface(mBinder).turnOffIms(mSlotId, mSupportedFeature);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IImsEcbm getEcbmInterface(int sessionId) throws RemoteException {
|
public IImsEcbm getEcbmInterface() throws RemoteException {
|
||||||
synchronized (mLock) {
|
synchronized (mLock) {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
return getServiceInterface(mBinder).getEcbmInterface(mSlotId, mSupportedFeature,
|
return getServiceInterface(mBinder).getEcbmInterface(mSlotId, mSupportedFeature);
|
||||||
sessionId);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setUiTTYMode(int sessionId, int uiTtyMode, Message onComplete)
|
public void setUiTTYMode(int uiTtyMode, Message onComplete)
|
||||||
throws RemoteException {
|
throws RemoteException {
|
||||||
synchronized (mLock) {
|
synchronized (mLock) {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
getServiceInterface(mBinder).setUiTTYMode(mSlotId, mSupportedFeature, sessionId,
|
getServiceInterface(mBinder).setUiTTYMode(mSlotId, mSupportedFeature, uiTtyMode,
|
||||||
uiTtyMode, onComplete);
|
onComplete);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IImsMultiEndpoint getMultiEndpointInterface(int sessionId) throws RemoteException {
|
public IImsMultiEndpoint getMultiEndpointInterface() throws RemoteException {
|
||||||
synchronized (mLock) {
|
synchronized (mLock) {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
return getServiceInterface(mBinder).getMultiEndpointInterface(mSlotId,
|
return getServiceInterface(mBinder).getMultiEndpointInterface(mSlotId,
|
||||||
mSupportedFeature, sessionId);
|
mSupportedFeature);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,6 +42,8 @@ import com.android.ims.internal.IImsUt;
|
|||||||
|
|
||||||
public class ImsServiceProxyCompat implements IMMTelFeature {
|
public class ImsServiceProxyCompat implements IMMTelFeature {
|
||||||
|
|
||||||
|
private static final int SERVICE_ID = ImsFeature.MMTEL;
|
||||||
|
|
||||||
protected final int mSlotId;
|
protected final int mSlotId;
|
||||||
protected IBinder mBinder;
|
protected IBinder mBinder;
|
||||||
|
|
||||||
@@ -65,29 +67,28 @@ public class ImsServiceProxyCompat implements IMMTelFeature {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isConnected(int sessionId, int callServiceType, int callType)
|
public boolean isConnected(int callServiceType, int callType)
|
||||||
throws RemoteException {
|
throws RemoteException {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
return getServiceInterface(mBinder).isConnected(sessionId, callServiceType, callType);
|
return getServiceInterface(mBinder).isConnected(SERVICE_ID, callServiceType, callType);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isOpened(int sessionId) throws RemoteException {
|
public boolean isOpened() throws RemoteException {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
return getServiceInterface(mBinder).isOpened(sessionId);
|
return getServiceInterface(mBinder).isOpened(SERVICE_ID);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addRegistrationListener(int sessionId, IImsRegistrationListener listener)
|
public void addRegistrationListener(IImsRegistrationListener listener)
|
||||||
throws RemoteException {
|
throws RemoteException {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
getServiceInterface(mBinder).addRegistrationListener(mSlotId, ImsFeature.MMTEL, listener);
|
getServiceInterface(mBinder).addRegistrationListener(mSlotId, ImsFeature.MMTEL, listener);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void removeRegistrationListener(int sessionId, IImsRegistrationListener listener)
|
public void removeRegistrationListener(IImsRegistrationListener listener)
|
||||||
throws RemoteException {
|
throws RemoteException {
|
||||||
checkBinderConnection();
|
|
||||||
// Not Implemented in old ImsService. If the registration listener becomes invalid, the
|
// Not Implemented in old ImsService. If the registration listener becomes invalid, the
|
||||||
// ImsService will remove.
|
// ImsService will remove.
|
||||||
}
|
}
|
||||||
@@ -114,46 +115,46 @@ public class ImsServiceProxyCompat implements IMMTelFeature {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IImsUt getUtInterface(int sessionId) throws RemoteException {
|
public IImsUt getUtInterface() throws RemoteException {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
return getServiceInterface(mBinder).getUtInterface(sessionId);
|
return getServiceInterface(mBinder).getUtInterface(SERVICE_ID);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IImsConfig getConfigInterface(int sessionId) throws RemoteException {
|
public IImsConfig getConfigInterface() throws RemoteException {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
return getServiceInterface(mBinder).getConfigInterface(mSlotId);
|
return getServiceInterface(mBinder).getConfigInterface(mSlotId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void turnOnIms(int sessionId) throws RemoteException {
|
public void turnOnIms() throws RemoteException {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
getServiceInterface(mBinder).turnOnIms(mSlotId);
|
getServiceInterface(mBinder).turnOnIms(mSlotId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void turnOffIms(int sessionId) throws RemoteException {
|
public void turnOffIms() throws RemoteException {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
getServiceInterface(mBinder).turnOffIms(mSlotId);
|
getServiceInterface(mBinder).turnOffIms(mSlotId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IImsEcbm getEcbmInterface(int sessionId) throws RemoteException {
|
public IImsEcbm getEcbmInterface() throws RemoteException {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
return getServiceInterface(mBinder).getEcbmInterface(sessionId);
|
return getServiceInterface(mBinder).getEcbmInterface(SERVICE_ID);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setUiTTYMode(int sessionId, int uiTtyMode, Message onComplete)
|
public void setUiTTYMode(int uiTtyMode, Message onComplete)
|
||||||
throws RemoteException {
|
throws RemoteException {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
getServiceInterface(mBinder).setUiTTYMode(sessionId, uiTtyMode, onComplete);
|
getServiceInterface(mBinder).setUiTTYMode(SERVICE_ID, uiTtyMode, onComplete);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IImsMultiEndpoint getMultiEndpointInterface(int sessionId) throws RemoteException {
|
public IImsMultiEndpoint getMultiEndpointInterface() throws RemoteException {
|
||||||
checkBinderConnection();
|
checkBinderConnection();
|
||||||
return getServiceInterface(mBinder).getMultiEndpointInterface(sessionId);
|
return getServiceInterface(mBinder).getMultiEndpointInterface(SERVICE_ID);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -68,7 +68,6 @@ public interface IMMTelFeature {
|
|||||||
* Checks if the IMS service has successfully registered to the IMS network with the specified
|
* Checks if the IMS service has successfully registered to the IMS network with the specified
|
||||||
* service & call type.
|
* service & call type.
|
||||||
*
|
*
|
||||||
* @param sessionId a session id which is obtained from {@link #startSession}
|
|
||||||
* @param callServiceType a service type that is specified in {@link ImsCallProfile}
|
* @param callServiceType a service type that is specified in {@link ImsCallProfile}
|
||||||
* {@link ImsCallProfile#SERVICE_TYPE_NORMAL}
|
* {@link ImsCallProfile#SERVICE_TYPE_NORMAL}
|
||||||
* {@link ImsCallProfile#SERVICE_TYPE_EMERGENCY}
|
* {@link ImsCallProfile#SERVICE_TYPE_EMERGENCY}
|
||||||
@@ -80,31 +79,28 @@ public interface IMMTelFeature {
|
|||||||
* @return true if the specified service id is connected to the IMS network; false otherwise
|
* @return true if the specified service id is connected to the IMS network; false otherwise
|
||||||
* @throws RemoteException
|
* @throws RemoteException
|
||||||
*/
|
*/
|
||||||
boolean isConnected(int sessionId, int callServiceType, int callType) throws RemoteException;
|
boolean isConnected(int callServiceType, int callType) throws RemoteException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks if the specified IMS service is opened.
|
* Checks if the specified IMS service is opened.
|
||||||
*
|
*
|
||||||
* @param sessionId a service id which is obtained from {@link #startSession}
|
|
||||||
* @return true if the specified service id is opened; false otherwise
|
* @return true if the specified service id is opened; false otherwise
|
||||||
*/
|
*/
|
||||||
boolean isOpened(int sessionId) throws RemoteException;
|
boolean isOpened() throws RemoteException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a new registration listener for the client associated with the session Id.
|
* Add a new registration listener for the client associated with the session Id.
|
||||||
* @param sessionId a session id which is obtained from {@link #startSession}
|
|
||||||
* @param listener An implementation of IImsRegistrationListener.
|
* @param listener An implementation of IImsRegistrationListener.
|
||||||
*/
|
*/
|
||||||
void addRegistrationListener(int sessionId, IImsRegistrationListener listener)
|
void addRegistrationListener(IImsRegistrationListener listener)
|
||||||
throws RemoteException;
|
throws RemoteException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Remove a previously registered listener using {@link #addRegistrationListener} for the client
|
* Remove a previously registered listener using {@link #addRegistrationListener} for the client
|
||||||
* associated with the session Id.
|
* associated with the session Id.
|
||||||
* @param sessionId a session id which is obtained from {@link #startSession}
|
|
||||||
* @param listener A previously registered IImsRegistrationListener
|
* @param listener A previously registered IImsRegistrationListener
|
||||||
*/
|
*/
|
||||||
void removeRegistrationListener(int sessionId, IImsRegistrationListener listener)
|
void removeRegistrationListener(IImsRegistrationListener listener)
|
||||||
throws RemoteException;
|
throws RemoteException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -152,41 +148,40 @@ public interface IMMTelFeature {
|
|||||||
/**
|
/**
|
||||||
* @return The Ut interface for the supplementary service configuration.
|
* @return The Ut interface for the supplementary service configuration.
|
||||||
*/
|
*/
|
||||||
IImsUt getUtInterface(int sessionId) throws RemoteException;
|
IImsUt getUtInterface() throws RemoteException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return The config interface for IMS Configuration
|
* @return The config interface for IMS Configuration
|
||||||
*/
|
*/
|
||||||
IImsConfig getConfigInterface(int sessionId) throws RemoteException;
|
IImsConfig getConfigInterface() throws RemoteException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Signal the MMTelFeature to turn on IMS when it has been turned off using {@link #turnOffIms}
|
* Signal the MMTelFeature to turn on IMS when it has been turned off using {@link #turnOffIms}
|
||||||
* @param sessionId a session id which is obtained from {@link #startSession}
|
* @param sessionId a session id which is obtained from {@link #startSession}
|
||||||
*/
|
*/
|
||||||
void turnOnIms(int sessionId) throws RemoteException;
|
void turnOnIms() throws RemoteException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Signal the MMTelFeature to turn off IMS when it has been turned on using {@link #turnOnIms}
|
* Signal the MMTelFeature to turn off IMS when it has been turned on using {@link #turnOnIms}
|
||||||
* @param sessionId a session id which is obtained from {@link #startSession}
|
* @param sessionId a session id which is obtained from {@link #startSession}
|
||||||
*/
|
*/
|
||||||
void turnOffIms(int sessionId) throws RemoteException;
|
void turnOffIms() throws RemoteException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return The Emergency call-back mode interface for emergency VoLTE calls that support it.
|
* @return The Emergency call-back mode interface for emergency VoLTE calls that support it.
|
||||||
*/
|
*/
|
||||||
IImsEcbm getEcbmInterface(int sessionId) throws RemoteException;
|
IImsEcbm getEcbmInterface() throws RemoteException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the current UI TTY mode for the MMTelFeature.
|
* Sets the current UI TTY mode for the MMTelFeature.
|
||||||
* @param sessionId a session id which is obtained from {@link #startSession}
|
|
||||||
* @param uiTtyMode An integer containing the new UI TTY Mode.
|
* @param uiTtyMode An integer containing the new UI TTY Mode.
|
||||||
* @param onComplete A {@link Message} to be used when the mode has been set.
|
* @param onComplete A {@link Message} to be used when the mode has been set.
|
||||||
* @throws RemoteException
|
* @throws RemoteException
|
||||||
*/
|
*/
|
||||||
void setUiTTYMode(int sessionId, int uiTtyMode, Message onComplete) throws RemoteException;
|
void setUiTTYMode(int uiTtyMode, Message onComplete) throws RemoteException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return MultiEndpoint interface for DEP notifications
|
* @return MultiEndpoint interface for DEP notifications
|
||||||
*/
|
*/
|
||||||
IImsMultiEndpoint getMultiEndpointInterface(int sessionId) throws RemoteException;
|
IImsMultiEndpoint getMultiEndpointInterface() throws RemoteException;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,21 +50,21 @@ public class MMTelFeature extends ImsFeature implements IMMTelFeature {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isConnected(int sessionId, int callSessionType, int callType) {
|
public boolean isConnected(int callSessionType, int callType) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isOpened(int sessionId) {
|
public boolean isOpened() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addRegistrationListener(int sessionId, IImsRegistrationListener listener) {
|
public void addRegistrationListener(IImsRegistrationListener listener) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void removeRegistrationListener(int sessionId, IImsRegistrationListener listener) {
|
public void removeRegistrationListener(IImsRegistrationListener listener) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -84,34 +84,34 @@ public class MMTelFeature extends ImsFeature implements IMMTelFeature {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IImsUt getUtInterface(int sessionId) {
|
public IImsUt getUtInterface() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IImsConfig getConfigInterface(int sessionId) {
|
public IImsConfig getConfigInterface() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void turnOnIms(int sessionId) {
|
public void turnOnIms() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void turnOffIms(int sessionId) {
|
public void turnOffIms() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IImsEcbm getEcbmInterface(int sessionId) {
|
public IImsEcbm getEcbmInterface() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setUiTTYMode(int sessionId, int uiTtyMode, Message onComplete) {
|
public void setUiTTYMode(int uiTtyMode, Message onComplete) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IImsMultiEndpoint getMultiEndpointInterface(int sessionId) {
|
public IImsMultiEndpoint getMultiEndpointInterface() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,24 +42,23 @@ interface IImsServiceController {
|
|||||||
int startSession(int slotId, int featureType, in PendingIntent incomingCallIntent,
|
int startSession(int slotId, int featureType, in PendingIntent incomingCallIntent,
|
||||||
in IImsRegistrationListener listener);
|
in IImsRegistrationListener listener);
|
||||||
void endSession(int slotId, int featureType, int sessionId);
|
void endSession(int slotId, int featureType, int sessionId);
|
||||||
boolean isConnected(int slotId, int featureType, int sessionId, int callSessionType, int callType);
|
boolean isConnected(int slotId, int featureType, int callSessionType, int callType);
|
||||||
boolean isOpened(int slotId, int featureType, int sessionId);
|
boolean isOpened(int slotId, int featureType);
|
||||||
int getFeatureStatus(int slotId, int featureType);
|
int getFeatureStatus(int slotId, int featureType);
|
||||||
void addRegistrationListener(int slotId, int featureType, int sessionId,
|
void addRegistrationListener(int slotId, int featureType, in IImsRegistrationListener listener);
|
||||||
|
void removeRegistrationListener(int slotId, int featureType,
|
||||||
in IImsRegistrationListener listener);
|
in IImsRegistrationListener listener);
|
||||||
void removeRegistrationListener(int slotId, int featureType, int sessionId,
|
ImsCallProfile createCallProfile(int slotId, int featureType, int sessionId,
|
||||||
in IImsRegistrationListener listener);
|
int callSessionType, int callType);
|
||||||
ImsCallProfile createCallProfile(int slotId, int featureType, int sessionId, int callSessionType, int callType);
|
|
||||||
IImsCallSession createCallSession(int slotId, int featureType, int sessionId,
|
IImsCallSession createCallSession(int slotId, int featureType, int sessionId,
|
||||||
in ImsCallProfile profile, IImsCallSessionListener listener);
|
in ImsCallProfile profile, IImsCallSessionListener listener);
|
||||||
IImsCallSession getPendingCallSession(int slotId, int featureType, int sessionId,
|
IImsCallSession getPendingCallSession(int slotId, int featureType, int sessionId,
|
||||||
String callId);
|
String callId);
|
||||||
IImsUt getUtInterface(int slotId, int featureType, int sessionId);
|
IImsUt getUtInterface(int slotId, int featureType);
|
||||||
IImsConfig getConfigInterface(int slotId, int featureType, int sessionId);
|
IImsConfig getConfigInterface(int slotId, int featureType);
|
||||||
void turnOnIms(int slotId, int featureType, int sessionId);
|
void turnOnIms(int slotId, int featureType);
|
||||||
void turnOffIms(int slotId, int featureType, int sessionId);
|
void turnOffIms(int slotId, int featureType);
|
||||||
IImsEcbm getEcbmInterface(int slotId, int featureType, int sessionId);
|
IImsEcbm getEcbmInterface(int slotId, int featureType);
|
||||||
void setUiTTYMode(int slotId, int featureType, int sessionId, int uiTtyMode,
|
void setUiTTYMode(int slotId, int featureType, int uiTtyMode, in Message onComplete);
|
||||||
in Message onComplete);
|
IImsMultiEndpoint getMultiEndpointInterface(int slotId, int featureType);
|
||||||
IImsMultiEndpoint getMultiEndpointInterface(int slotId, int featureType, int sessionId);
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user