Integrate MMTel APIs into the framework
1) Integrates the new ImsService APIs into ImsManager.
2) Removes all Compat layers (ImsServiceProxy) and
moves all relevant functionality into
MmTelFeatureConnection. Also tries to encapsulate more
of the MmTel specific functionality in this class.
3) Compat method for ImsConnectionStateListener that
converts old method of updating MMTel capabilites
to the new method.
Bug: 63987047
Test: Telephony Test ImsService App
Merged-In: Ic30429bed05191f00a8e4bc1d2b63f125d4e7524
Change-Id: Ic30429bed05191f00a8e4bc1d2b63f125d4e7524
diff --git a/src/java/com/android/ims/ImsConnectionStateListener.java b/src/java/com/android/ims/ImsConnectionStateListener.java
index 216bc41..049b846 100644
--- a/src/java/com/android/ims/ImsConnectionStateListener.java
+++ b/src/java/com/android/ims/ImsConnectionStateListener.java
@@ -17,8 +17,12 @@
package com.android.ims;
import android.net.Uri;
+import android.telephony.ims.feature.ImsFeature;
+import android.telephony.ims.feature.MmTelFeature;
import android.telephony.ims.stub.ImsRegistrationImplBase;
+import java.util.Arrays;
+
/**
* Listener for receiving notifications about changes to the IMS connection.
* It provides a state of IMS registration between UE and IMS network, the service
@@ -53,6 +57,69 @@
public void onSubscriberAssociatedUriChanged(Uri[] uris) {
registrationAssociatedUriChanged(uris);
}
+
+ /**
+ * Used to convert from the new capabilities structure to the old features structure for
+ * backwards compatibility.
+ * @param imsRadioTech The registration that will be used to convert to the old feature
+ * structure. Can be either {@link ImsRegistrationImplBase#REGISTRATION_TECH_LTE} or
+ * {@link ImsRegistrationImplBase#REGISTRATION_TECH_IWLAN}
+ * @param c Capabilities that will be turned into old feature array.
+ */
+ public void onFeatureCapabilityChangedAdapter(
+ @ImsRegistrationImplBase.ImsRegistrationTech int imsRadioTech,
+ ImsFeature.Capabilities c) {
+ // Size of ImsConfig.FeatureConstants
+ int[] enabledCapabilities = new int[6];
+ // UNKNOWN means disabled.
+ Arrays.fill(enabledCapabilities, ImsConfig.FeatureConstants.FEATURE_TYPE_UNKNOWN);
+ // Size of ImsConfig.FeatureConstants
+ int[] disabledCapabilities = new int[6];
+ Arrays.fill(disabledCapabilities, ImsConfig.FeatureConstants.FEATURE_TYPE_UNKNOWN);
+ // populate enabledCapabilities
+ switch (imsRadioTech) {
+ case ImsRegistrationImplBase.REGISTRATION_TECH_LTE: {
+ if (c.isCapable(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE)) {
+ // enabled means equal to its own integer value.
+ enabledCapabilities[ImsConfig.FeatureConstants.FEATURE_TYPE_VOICE_OVER_LTE] =
+ ImsConfig.FeatureConstants.FEATURE_TYPE_VOICE_OVER_LTE;
+ }
+ if (c.isCapable(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VIDEO)) {
+ enabledCapabilities[ImsConfig.FeatureConstants.FEATURE_TYPE_VIDEO_OVER_LTE] =
+ ImsConfig.FeatureConstants.FEATURE_TYPE_VIDEO_OVER_LTE;
+ }
+ if (c.isCapable(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_UT)) {
+ enabledCapabilities[ImsConfig.FeatureConstants.FEATURE_TYPE_UT_OVER_LTE] =
+ ImsConfig.FeatureConstants.FEATURE_TYPE_UT_OVER_LTE;
+ }
+ break;
+ }
+ case ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN: {
+ if (c.isCapable(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE)) {
+ enabledCapabilities[ImsConfig.FeatureConstants.FEATURE_TYPE_VOICE_OVER_WIFI] =
+ ImsConfig.FeatureConstants.FEATURE_TYPE_VOICE_OVER_WIFI;
+ }
+ if (c.isCapable(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VIDEO)) {
+ enabledCapabilities[ImsConfig.FeatureConstants.FEATURE_TYPE_VIDEO_OVER_WIFI] =
+ ImsConfig.FeatureConstants.FEATURE_TYPE_VOICE_OVER_WIFI;
+ }
+ if (c.isCapable(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_UT)) {
+ enabledCapabilities[ImsConfig.FeatureConstants.FEATURE_TYPE_UT_OVER_WIFI] =
+ ImsConfig.FeatureConstants.FEATURE_TYPE_UT_OVER_WIFI;
+ }
+ break;
+ }
+ }
+ // make disabledCapabilities the opposite of enabledCapabilities. Since the disabled
+ // capabilities array was defaulted to -1 it is UNKNOWN if not disabled.
+ for (int i = 0; i < enabledCapabilities.length; i++) {
+ if (enabledCapabilities[i] != i) {
+ disabledCapabilities[i] = i;
+ }
+ }
+ onFeatureCapabilityChanged(ImsServiceClass.MMTEL, enabledCapabilities,
+ disabledCapabilities);
+ }
/**
* Called when the device is connected to the IMS network with {@param imsRadioTech}.
*/
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index eaf973d..9cfff78 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -16,12 +16,12 @@
package com.android.ims;
+import android.annotation.Nullable;
import android.app.PendingIntent;
import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
import android.os.AsyncTask;
import android.os.Handler;
+import android.os.Bundle;
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
@@ -29,26 +29,24 @@
import android.os.PersistableBundle;
import android.os.RemoteException;
import android.os.SystemProperties;
-import android.provider.Settings;
import android.telecom.TelecomManager;
import android.telephony.CarrierConfigManager;
import android.telephony.ims.internal.feature.ImsFeature;
import android.telephony.ims.stub.ImsRegistrationImplBase;
import android.telephony.Rlog;
-import android.telephony.ServiceState;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
+import android.telephony.ims.aidl.IImsConfig;
+import android.telephony.ims.aidl.IImsSmsListener;
+import android.telephony.ims.feature.CapabilityChangeRequest;
+import android.telephony.ims.feature.ImsFeature;
+import android.telephony.ims.feature.MmTelFeature;
+import android.telephony.ims.stub.ImsRegistrationImplBase;
import android.util.Log;
import com.android.ims.internal.IImsCallSession;
-import com.android.ims.internal.IImsConfig;
import com.android.ims.internal.IImsEcbm;
import com.android.ims.internal.IImsMultiEndpoint;
-import com.android.ims.internal.IImsRegistration;
-import com.android.ims.internal.IImsRegistrationCallback;
-import com.android.ims.internal.IImsRegistrationListener;
-import com.android.ims.internal.IImsServiceController;
-import com.android.ims.internal.IImsSmsListener;
import com.android.ims.internal.IImsUt;
import com.android.ims.internal.ImsCallSession;
import com.android.internal.annotations.VisibleForTesting;
@@ -59,7 +57,6 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
@@ -87,13 +84,13 @@
/**
* The result code to be sent back with the incoming call {@link PendingIntent}.
- * @see #open(PendingIntent, ImsConnectionStateListener)
+ * @see #open(MmTelFeature.Listener)
*/
public static final int INCOMING_CALL_RESULT_CODE = 101;
/**
* Key to retrieve the call ID from an incoming call intent.
- * @see #open(PendingIntent, ImsConnectionStateListener)
+ * @see #open(MmTelFeature.Listener)
*/
public static final String EXTRA_CALL_ID = "android:imsCallID";
@@ -178,7 +175,7 @@
private CarrierConfigManager mConfigManager;
private int mPhoneId;
private final boolean mConfigDynamicBind;
- private ImsServiceProxy mImsServiceProxy = null;
+ private @Nullable MmTelFeatureConnection mMmTelFeatureConnection = null;
private ImsServiceDeathRecipient mDeathRecipient = new ImsServiceDeathRecipient();
// Ut interface for the supplementary service configuration
private ImsUt mUt = null;
@@ -193,25 +190,8 @@
private ImsMultiEndpoint mMultiEndpoint = null;
- private Set<ImsServiceProxy.IFeatureUpdate> mStatusCallbacks = new CopyOnWriteArraySet<>();
-
- // Keep track of the ImsRegistrationListenerProxys that have been created so that we can
- // remove them from the ImsService.
- private final Set<ImsConnectionStateListener> mRegistrationListeners = new HashSet<>();
-
-
- // Used for compatibility with the old Registration method
- // TODO: Remove once the compat layer is in place
- private final ImsRegistrationListenerProxy mImsRegistrationListenerProxy =
- new ImsRegistrationListenerProxy();
- // New API for registration to the ImsService.
- private final ImsRegistrationCallback mRegistrationCallback = new ImsRegistrationCallback();
-
-
- // When true, we have registered the mRegistrationListenerProxy with the ImsService. Don't do
- // it again.
- private boolean mHasRegisteredForProxy = false;
- private final Object mHasRegisteredLock = new Object();
+ private Set<MmTelFeatureConnection.IFeatureUpdate> mStatusCallbacks =
+ new CopyOnWriteArraySet<>();
// SystemProperties used as cache
private static final String VOLTE_PROVISIONED_PROP = "net.lte.ims.volte.provisioned";
@@ -598,16 +578,12 @@
* Change persistent VT enabled setting for slot.
*/
public void setVtSetting(boolean enabled) {
- SubscriptionManager.setSubscriptionProperty(getSubId(),
- SubscriptionManager.VT_IMS_ENABLED,
+ SubscriptionManager.setSubscriptionProperty(getSubId(), SubscriptionManager.VT_IMS_ENABLED,
booleanToPropertyString(enabled));
+
try {
- ImsConfig config = getConfigInterface();
- config.setFeatureValue(ImsConfig.FeatureConstants.FEATURE_TYPE_VIDEO_OVER_LTE,
- TelephonyManager.NETWORK_TYPE_LTE,
- enabled ? ImsConfig.FeatureValueConstants.ON
- : ImsConfig.FeatureValueConstants.OFF,
- mImsConfigListener);
+ changeMmTelCapability(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VIDEO,
+ ImsRegistrationImplBase.REGISTRATION_TECH_LTE, enabled);
if (enabled) {
log("setVtSetting(b) : turnOnIms");
@@ -618,7 +594,10 @@
log("setVtSetting(b) : imsServiceAllowTurnOff -> turnOffIms");
turnOffIms();
}
- } catch (ImsException e) {
+ } catch (ImsException | RemoteException e) {
+ // The ImsService is down. Since the SubscriptionManager already recorded the user's
+ // preference, it will be resent in updateImsServiceConfig when the ImsPhoneCallTracker
+ // reconnects.
loge("setVtSetting(b): ", e);
}
}
@@ -717,18 +696,13 @@
* @param wfcMode The WFC preference if WFC is enabled
*/
public void setWfcNonPersistent(boolean enabled, int wfcMode) {
- int imsFeatureValue =
- enabled ? ImsConfig.FeatureValueConstants.ON : ImsConfig.FeatureValueConstants.OFF;
// Force IMS to register over LTE when turning off WFC
int imsWfcModeFeatureValue =
enabled ? wfcMode : ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED;
try {
- ImsConfig config = getConfigInterface();
- config.setFeatureValue(ImsConfig.FeatureConstants.FEATURE_TYPE_VOICE_OVER_WIFI,
- TelephonyManager.NETWORK_TYPE_IWLAN,
- imsFeatureValue,
- mImsConfigListener);
+ changeMmTelCapability(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE,
+ ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN, enabled);
if (enabled) {
log("setWfcSetting() : turnOnIms");
@@ -741,7 +715,7 @@
}
setWfcModeInternal(imsWfcModeFeatureValue);
- } catch (ImsException e) {
+ } catch (ImsException | RemoteException e) {
loge("setWfcSetting(): ", e);
}
}
@@ -915,7 +889,7 @@
Thread thread = new Thread(new Runnable() {
public void run() {
try {
- imsManager.getConfigInterface().setProvisionedValue(
+ imsManager.getConfigInterface().setConfig(
ImsConfig.ConfigConstants.VOICE_OVER_WIFI_MODE,
value);
} catch (ImsException e) {
@@ -931,7 +905,7 @@
final int value = wfcMode;
Thread thread = new Thread(() -> {
try {
- getConfigInterface().setProvisionedValue(
+ getConfigInterface().setConfig(
ImsConfig.ConfigConstants.VOICE_OVER_WIFI_MODE, value);
} catch (ImsException e) {
// do nothing
@@ -1001,7 +975,7 @@
: ImsConfig.FeatureValueConstants.OFF;
Thread thread = new Thread(() -> {
try {
- getConfigInterface().setProvisionedValue(
+ getConfigInterface().setConfig(
ImsConfig.ConfigConstants.VOICE_OVER_WIFI_ROAMING, value);
} catch (ImsException e) {
// do nothing
@@ -1225,8 +1199,8 @@
// TODO: Extend ImsConfig API and set all feature values in single function call.
// Note: currently the order of updates is set to produce different order of
- // setFeatureValue() function calls from setAdvanced4GMode(). This is done to
- // differentiate this code path from vendor code perspective.
+ // changeEnabledCapabilities() function calls from setAdvanced4GMode(). This is done
+ // to differentiate this code path from vendor code perspective.
boolean isImsUsed = updateVolteFeatureValue();
isImsUsed |= updateWfcFeatureAndProvisionedValues();
isImsUsed |= updateVideoCallFeatureValue();
@@ -1245,7 +1219,7 @@
}
mConfigUpdated = true;
- } catch (ImsException e) {
+ } catch (ImsException | RemoteException e) {
loge("updateImsServiceConfig: ", e);
mConfigUpdated = false;
}
@@ -1257,7 +1231,7 @@
* @return whether feature is On
* @throws ImsException
*/
- private boolean updateVolteFeatureValue() throws ImsException {
+ private boolean updateVolteFeatureValue() throws RemoteException {
boolean available = isVolteEnabledByPlatform();
boolean enabled = isEnhanced4gLteModeSettingEnabledByUser();
boolean isNonTty = isNonTtyOrTtyOnVolteEnabled();
@@ -1267,13 +1241,8 @@
+ ", enabled = " + enabled
+ ", nonTTY = " + isNonTty);
- getConfigInterface().setFeatureValue(
- ImsConfig.FeatureConstants.FEATURE_TYPE_VOICE_OVER_LTE,
- TelephonyManager.NETWORK_TYPE_LTE,
- isFeatureOn ?
- ImsConfig.FeatureValueConstants.ON :
- ImsConfig.FeatureValueConstants.OFF,
- mImsConfigListener);
+ changeMmTelCapability(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE,
+ ImsRegistrationImplBase.REGISTRATION_TECH_LTE, isFeatureOn);
return isFeatureOn;
}
@@ -1283,7 +1252,7 @@
* @return whether feature is On
* @throws ImsException
*/
- private boolean updateVideoCallFeatureValue() throws ImsException {
+ private boolean updateVideoCallFeatureValue() throws RemoteException {
boolean available = isVtEnabledByPlatform();
boolean enabled = isVtEnabledByUser();
boolean isNonTty = isNonTtyOrTtyOnVolteEnabled();
@@ -1299,13 +1268,8 @@
+ ", nonTTY = " + isNonTty
+ ", data enabled = " + isDataEnabled);
- getConfigInterface().setFeatureValue(
- ImsConfig.FeatureConstants.FEATURE_TYPE_VIDEO_OVER_LTE,
- TelephonyManager.NETWORK_TYPE_LTE,
- isFeatureOn ?
- ImsConfig.FeatureValueConstants.ON :
- ImsConfig.FeatureValueConstants.OFF,
- mImsConfigListener);
+ changeMmTelCapability(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VIDEO,
+ ImsRegistrationImplBase.REGISTRATION_TECH_LTE, isFeatureOn);
return isFeatureOn;
}
@@ -1315,7 +1279,7 @@
* @return whether feature is On
* @throws ImsException
*/
- private boolean updateWfcFeatureAndProvisionedValues() throws ImsException {
+ private boolean updateWfcFeatureAndProvisionedValues() throws RemoteException {
TelephonyManager tm = new TelephonyManager(mContext, getSubId());
boolean isNetworkRoaming = tm.isNetworkRoaming();
boolean available = isWfcEnabledByPlatform();
@@ -1330,13 +1294,8 @@
+ ", mode = " + mode
+ ", roaming = " + roaming);
- getConfigInterface().setFeatureValue(
- ImsConfig.FeatureConstants.FEATURE_TYPE_VOICE_OVER_WIFI,
- TelephonyManager.NETWORK_TYPE_IWLAN,
- isFeatureOn ?
- ImsConfig.FeatureValueConstants.ON :
- ImsConfig.FeatureValueConstants.OFF,
- mImsConfigListener);
+ changeMmTelCapability(MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE,
+ ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN, isFeatureOn);
if (!isFeatureOn) {
mode = ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED;
@@ -1382,7 +1341,7 @@
public boolean isServiceAvailable() {
connectIfServiceIsAvailable();
// mImsServiceProxy will always create an ImsServiceProxy.
- return mImsServiceProxy.isBinderAlive();
+ return mMmTelFeatureConnection.isBinderAlive();
}
/*
@@ -1390,19 +1349,19 @@
*/
public boolean isServiceReady() {
connectIfServiceIsAvailable();
- return mImsServiceProxy.isBinderReady();
+ return mMmTelFeatureConnection.isBinderReady();
}
/**
* If the service is available, try to reconnect.
*/
public void connectIfServiceIsAvailable() {
- if (mImsServiceProxy == null || !mImsServiceProxy.isBinderAlive()) {
+ if (mMmTelFeatureConnection == null || !mMmTelFeatureConnection.isBinderAlive()) {
createImsService();
}
}
- public void setImsConfigListener(ImsConfigListener listener) {
+ public void setConfigListener(ImsConfigListener listener) {
mImsConfigListener = listener;
}
@@ -1411,9 +1370,9 @@
* Adds a callback for status changed events if the binder is already available. If it is not,
* this method will throw an ImsException.
*/
- public void addNotifyStatusChangedCallbackIfAvailable(ImsServiceProxy.IFeatureUpdate c)
+ public void addNotifyStatusChangedCallbackIfAvailable(MmTelFeatureConnection.IFeatureUpdate c)
throws ImsException {
- if (!mImsServiceProxy.isBinderAlive()) {
+ if (!mMmTelFeatureConnection.isBinderAlive()) {
throw new ImsException("Binder is not active!",
ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
}
@@ -1422,7 +1381,7 @@
}
}
- public void removeNotifyStatusChangedCallback(ImsServiceProxy.IFeatureUpdate c) {
+ public void removeNotifyStatusChangedCallback(MmTelFeatureConnection.IFeatureUpdate c) {
if (c != null) {
mStatusCallbacks.remove(c);
} else {
@@ -1432,63 +1391,30 @@
/**
* Opens the IMS service for making calls and/or receiving generic IMS calls.
- * The caller may make subsquent calls through {@link #makeCall}.
+ * The caller may make subsequent calls through {@link #makeCall}.
* The IMS service will register the device to the operator's network with the credentials
* (from ISIM) periodically in order to receive calls from the operator's network.
- * When the IMS service receives a new call, it will send out an intent with
- * the provided action string.
- * The intent contains a call ID extra {@link getCallId} and it can be used to take a call.
- *
- * @param serviceClass a service class specified in {@link ImsServiceClass}
- * For VoLTE service, it MUST be a {@link ImsServiceClass#MMTEL}.
- * @param incomingCallPendingIntent When an incoming call is received,
- * the IMS service will call {@link PendingIntent#send(Context, int, Intent)} to
- * send back the intent to the caller with {@link #INCOMING_CALL_RESULT_CODE}
- * as the result code and the intent to fill in the call ID; It cannot be null
- * @param listener To listen to IMS registration events; It cannot be null
- * @return identifier (greater than 0) for the specified service
- * @throws NullPointerException if {@code incomingCallPendingIntent}
- * or {@code listener} is null
+ * When the IMS service receives a new call, it will call
+ * {@link MmTelFeature.Listener#onIncomingCall}
+ * The listener contains a call ID extra {@link #getCallId} and it can be used to take a call.
+ * @param listener A {@link MmTelFeature.Listener}, which is the interface the
+ * {@link MmTelFeature} uses to notify the framework of updates
+ * @throws NullPointerException if {@code listener} is null
* @throws ImsException if calling the IMS service results in an error
* @see #getCallId
- * @see #getImsSessionId
*/
- public int open(int serviceClass, PendingIntent incomingCallPendingIntent,
- ImsConnectionStateListener listener) throws ImsException {
+ public void open(MmTelFeature.Listener listener) throws ImsException {
checkAndThrowExceptionIfServiceUnavailable();
- if (incomingCallPendingIntent == null) {
- throw new NullPointerException("incomingCallPendingIntent can't be null");
- }
-
if (listener == null) {
throw new NullPointerException("listener can't be null");
}
- int result = 0;
-
try {
- // Register a stub implementation of the ImsRegistrationListener. There is the
- // possibility that if we use the real implementation of the ImsRegistrationListener,
- // it will be added twice.
- // TODO: Remove ImsRegistrationListener from startSession API (b/62588776)
- result = mImsServiceProxy.startSession(incomingCallPendingIntent,
- new ImsRegistrationListenerBase());
- addRegistrationListener(listener);
- log("open: Session started and registration listener added.");
+ mMmTelFeatureConnection.openConnection(listener);
} catch (RemoteException e) {
- throw new ImsException("open()", e,
- ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
+ throw new ImsException("open()", e, ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
}
-
- if (result <= 0) {
- // If the return value is a minus value,
- // it means that an error occurred in the service.
- // So, it needs to convert to the reason code specified in ImsReasonInfo.
- throw new ImsException("open()", (result * (-1)));
- }
-
- return result;
}
/**
@@ -1513,34 +1439,68 @@
* @param listener To listen to IMS registration events; It cannot be null
* @throws NullPointerException if {@code listener} is null
* @throws ImsException if calling the IMS service results in an error
+ * @deprecated use {@link #addRegistrationCallback(ImsRegistrationImplBase.Callback)} and
+ * {@link #addCapabilitiesCallback(ImsFeature.CapabilityCallback)} instead.
*/
public void addRegistrationListener(ImsConnectionStateListener listener) throws ImsException {
if (listener == null) {
throw new NullPointerException("listener can't be null");
}
- // We only want this Proxy registered once.
- synchronized (mHasRegisteredLock) {
- if (!mHasRegisteredForProxy) {
- try {
- checkAndThrowExceptionIfServiceUnavailable();
- // TODO: Remove once new MmTelFeature is merged in
- mImsServiceProxy.addRegistrationListener(mImsRegistrationListenerProxy);
- IImsRegistration regBinder = mImsServiceProxy.getRegistration();
- if (regBinder != null) {
- regBinder.addRegistrationCallback(mRegistrationCallback);
- }
- log("Registration Callback/Listener registered.");
- // Only record if there isn't a RemoteException.
- mHasRegisteredForProxy = true;
- } catch (RemoteException e) {
- throw new ImsException("addRegistrationListener()", e,
- ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
- }
+ addRegistrationCallback(listener);
+ // connect the ImsConnectionStateListener to the new CapabilityCallback.
+ addCapabilitiesCallback(new ImsFeature.CapabilityCallback() {
+ @Override
+ public void onCapabilitiesStatusChanged(ImsFeature.Capabilities config) {
+ listener.onFeatureCapabilityChangedAdapter(getRegistrationTech(), config);
}
+ });
+ log("Registration Callback registered.");
+ }
+
+ /**
+ * Adds a callback that gets called when IMS registration has changed.
+ * @param callback A {@link ImsRegistrationImplBase.Callback} that will notify the caller when
+ * IMS registration status has changed.
+ * @throws ImsException when the ImsService connection is not available.
+ */
+ public void addRegistrationCallback(ImsRegistrationImplBase.Callback callback)
+ throws ImsException {
+ if (callback == null) {
+ throw new NullPointerException("registration callback can't be null");
}
- synchronized (mRegistrationListeners) {
- log("Local registration listener added: " + listener);
- mRegistrationListeners.add(listener);
+
+ checkAndThrowExceptionIfServiceUnavailable();
+ try {
+ mMmTelFeatureConnection.addRegistrationCallback(callback);
+ log("Registration Callback registered.");
+ // Only record if there isn't a RemoteException.
+ } catch (RemoteException e) {
+ throw new ImsException("addRegistrationCallback(IRIB)", e,
+ ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
+ }
+ }
+
+ /**
+ * Adds a callback that gets called when MMTel capability status has changed, for example when
+ * Voice over IMS or VT over IMS is not available currently.
+ * @param callback A {@link ImsFeature.CapabilityCallback} that will notify the caller when
+ * MMTel capability status has changed.
+ * @throws ImsException when the ImsService connection is not available.
+ */
+ public void addCapabilitiesCallback(ImsFeature.CapabilityCallback callback)
+ throws ImsException {
+ if (callback == null) {
+ throw new NullPointerException("capabilities callback can't be null");
+ }
+
+ checkAndThrowExceptionIfServiceUnavailable();
+ try {
+ mMmTelFeatureConnection.addCapabilityCallback(callback);
+ log("Capability Callback registered.");
+ // Only record if there isn't a RemoteException.
+ } catch (RemoteException e) {
+ throw new ImsException("addCapabilitiesCallback(IF)", e,
+ ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
}
}
@@ -1558,33 +1518,38 @@
throw new NullPointerException("listener can't be null");
}
- synchronized (mRegistrationListeners) {
- log("Local registration listener removed: " + listener);
- mRegistrationListeners.remove(listener);
+ checkAndThrowExceptionIfServiceUnavailable();
+ try {
+ mMmTelFeatureConnection.removeRegistrationCallback(listener);
+ log("Registration Callback/Listener registered.");
+ // Only record if there isn't a RemoteException.
+ } catch (RemoteException e) {
+ throw new ImsException("addRegistrationCallback()", e,
+ ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
+ }
+ }
+
+ public @ImsRegistrationImplBase.ImsRegistrationTech int getRegistrationTech() {
+ try {
+ return mMmTelFeatureConnection.getRegistrationTech();
+ } catch (RemoteException e) {
+ Log.w(TAG, "getRegistrationTech: no connection to ImsService.");
+ return ImsRegistrationImplBase.REGISTRATION_TECH_NONE;
}
}
/**
- * Closes the specified service ({@link ImsServiceClass}) not to make/receive calls.
+ * Closes the connection and removes all active callbacks.
* All the resources that were allocated to the service are also released.
- *
- * @param sessionId a session id to be closed which is obtained from {@link ImsManager#open}
- * @throws ImsException if calling the IMS service results in an error
*/
- public void close(int sessionId) throws ImsException {
- checkAndThrowExceptionIfServiceUnavailable();
-
- try {
- mImsServiceProxy.endSession(sessionId);
- } catch (RemoteException e) {
- throw new ImsException("close()", e,
- ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
- } finally {
- mUt = null;
- mConfig = null;
- mEcbm = null;
- mMultiEndpoint = null;
+ public void close() {
+ if (mMmTelFeatureConnection != null) {
+ mMmTelFeatureConnection.closeConnection();
}
+ mUt = null;
+ mConfig = null;
+ mEcbm = null;
+ mMultiEndpoint = null;
}
/**
@@ -1593,8 +1558,7 @@
* @return the Ut interface instance
* @throws ImsException if getting the Ut interface results in an error
*/
- public ImsUtInterface getSupplementaryServiceConfiguration()
- throws ImsException {
+ public ImsUtInterface getSupplementaryServiceConfiguration() throws ImsException {
// FIXME: manage the multiple Ut interfaces based on the session id
if (mUt != null && mUt.isBinderAlive()) {
return mUt;
@@ -1602,7 +1566,7 @@
checkAndThrowExceptionIfServiceUnavailable();
try {
- IImsUt iUt = mImsServiceProxy.getUtInterface();
+ IImsUt iUt = mMmTelFeatureConnection.getUtInterface();
if (iUt == null) {
throw new ImsException("getSupplementaryServiceConfiguration()",
@@ -1618,54 +1582,8 @@
}
/**
- * Checks if the IMS service has successfully registered to the IMS network
- * with the specified service & call type.
- *
- * @param serviceType a service type that is specified in {@link ImsCallProfile}
- * {@link ImsCallProfile#SERVICE_TYPE_NORMAL}
- * {@link ImsCallProfile#SERVICE_TYPE_EMERGENCY}
- * @param callType a call type that is specified in {@link ImsCallProfile}
- * {@link ImsCallProfile#CALL_TYPE_VOICE_N_VIDEO}
- * {@link ImsCallProfile#CALL_TYPE_VOICE}
- * {@link ImsCallProfile#CALL_TYPE_VT}
- * {@link ImsCallProfile#CALL_TYPE_VS}
- * @return true if the specified service id is connected to the IMS network;
- * false otherwise
- * @throws ImsException if calling the IMS service results in an error
- */
- public boolean isConnected(int serviceType, int callType)
- throws ImsException {
- checkAndThrowExceptionIfServiceUnavailable();
-
- try {
- return mImsServiceProxy.isConnected(serviceType, callType);
- } catch (RemoteException e) {
- throw new ImsException("isServiceConnected()", e,
- ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
- }
- }
-
- /**
- * Checks if the specified IMS service is opend.
- *
- * @return true if the specified service id is opened; false otherwise
- * @throws ImsException if calling the IMS service results in an error
- */
- public boolean isOpened() throws ImsException {
- checkAndThrowExceptionIfServiceUnavailable();
-
- try {
- return mImsServiceProxy.isOpened();
- } catch (RemoteException e) {
- throw new ImsException("isOpened()", e,
- ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
- }
- }
-
- /**
* Creates a {@link ImsCallProfile} from the service capabilities & IMS registration state.
*
- * @param sessionId a session id which is obtained from {@link ImsManager#open}
* @param serviceType a service type that is specified in {@link ImsCallProfile}
* {@link ImsCallProfile#SERVICE_TYPE_NONE}
* {@link ImsCallProfile#SERVICE_TYPE_NORMAL}
@@ -1682,12 +1600,11 @@
* @return a {@link ImsCallProfile} object
* @throws ImsException if calling the IMS service results in an error
*/
- public ImsCallProfile createCallProfile(int sessionId, int serviceType, int callType)
- throws ImsException {
+ public ImsCallProfile createCallProfile(int serviceType, int callType) throws ImsException {
checkAndThrowExceptionIfServiceUnavailable();
try {
- return mImsServiceProxy.createCallProfile(sessionId, serviceType, callType);
+ return mMmTelFeatureConnection.createCallProfile(serviceType, callType);
} catch (RemoteException e) {
throw new ImsException("createCallProfile()", e,
ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
@@ -1697,19 +1614,17 @@
/**
* Creates a {@link ImsCall} to make a call.
*
- * @param sessionId a session id which is obtained from {@link ImsManager#open}
* @param profile a call profile to make the call
* (it contains service type, call type, media information, etc.)
- * @param participants participants to invite the conference call
+ * @param callees participants to invite the conference call
* @param listener listen to the call events from {@link ImsCall}
* @return a {@link ImsCall} object
* @throws ImsException if calling the IMS service results in an error
*/
- public ImsCall makeCall(int sessionId, ImsCallProfile profile, String[] callees,
+ public ImsCall makeCall(ImsCallProfile profile, String[] callees,
ImsCall.Listener listener) throws ImsException {
if (DBG) {
- log("makeCall :: sessionId=" + sessionId
- + ", profile=" + profile);
+ log("makeCall :: profile=" + profile);
}
checkAndThrowExceptionIfServiceUnavailable();
@@ -1717,7 +1632,7 @@
ImsCall call = new ImsCall(mContext, profile);
call.setListener(listener);
- ImsCallSession session = createCallSession(sessionId, profile);
+ ImsCallSession session = createCallSession(profile);
if ((callees != null) && (callees.length == 1)) {
call.start(session, callees[0]);
@@ -1732,33 +1647,25 @@
* Creates a {@link ImsCall} to take an incoming call.
*
* @param sessionId a session id which is obtained from {@link ImsManager#open}
- * @param incomingCallIntent the incoming call broadcast intent
+ * @param incomingCallExtras the incoming call broadcast intent
* @param listener to listen to the call events from {@link ImsCall}
* @return a {@link ImsCall} object
* @throws ImsException if calling the IMS service results in an error
*/
- public ImsCall takeCall(int sessionId, Intent incomingCallIntent,
+ public ImsCall takeCall(IImsCallSession session, Bundle incomingCallExtras,
ImsCall.Listener listener) throws ImsException {
if (DBG) {
- log("takeCall :: sessionId=" + sessionId
- + ", incomingCall=" + incomingCallIntent);
+ log("takeCall :: incomingCall=" + incomingCallExtras);
}
checkAndThrowExceptionIfServiceUnavailable();
- if (incomingCallIntent == null) {
+ if (incomingCallExtras == null) {
throw new ImsException("Can't retrieve session with null intent",
ImsReasonInfo.CODE_LOCAL_ILLEGAL_ARGUMENT);
}
- int incomingServiceId = getImsSessionId(incomingCallIntent);
-
- if (sessionId != incomingServiceId) {
- throw new ImsException("Service id is mismatched in the incoming call intent",
- ImsReasonInfo.CODE_LOCAL_ILLEGAL_ARGUMENT);
- }
-
- String callId = getCallId(incomingCallIntent);
+ String callId = getCallId(incomingCallExtras);
if (callId == null) {
throw new ImsException("Call ID missing in the incoming call intent",
@@ -1766,8 +1673,6 @@
}
try {
- IImsCallSession session = mImsServiceProxy.getPendingCallSession(sessionId, callId);
-
if (session == null) {
throw new ImsException("No pending session for the call",
ImsReasonInfo.CODE_LOCAL_NO_PENDING_CALL);
@@ -1797,7 +1702,7 @@
checkAndThrowExceptionIfServiceUnavailable();
try {
- IImsConfig config = mImsServiceProxy.getConfigInterface();
+ IImsConfig config = mMmTelFeatureConnection.getConfigInterface();
if (config == null) {
throw new ImsException("getConfigInterface()",
ImsReasonInfo.CODE_LOCAL_SERVICE_UNAVAILABLE);
@@ -1810,6 +1715,25 @@
return mConfig;
}
+ public void changeMmTelCapability(
+ @MmTelFeature.MmTelCapabilities.MmTelCapability int capability,
+ @ImsRegistrationImplBase.ImsRegistrationTech int radioTech,
+ boolean isEnabled) throws RemoteException {
+ CapabilityChangeRequest request = new CapabilityChangeRequest();
+ if (isEnabled) {
+ request.addCapabilitiesToEnableForTech(capability, radioTech);
+ } else {
+ request.addCapabilitiesToDisableForTech(capability, radioTech);
+ }
+ mMmTelFeatureConnection.changeEnabledCapabilities(request, null);
+ if (mImsConfigListener != null) {
+ mImsConfigListener.onSetFeatureResponse(capability,
+ mMmTelFeatureConnection.getRegistrationTech(),
+ isEnabled ? ImsConfig.FeatureValueConstants.ON
+ : ImsConfig.FeatureValueConstants.OFF, -1);
+ }
+ }
+
/**
* Set the TTY mode. This is the actual tty mode (varies depending on peripheral status)
*/
@@ -1831,7 +1755,7 @@
checkAndThrowExceptionIfServiceUnavailable();
try {
- mImsServiceProxy.setUiTTYMode(uiTtyMode, onComplete);
+ mMmTelFeatureConnection.setUiTTYMode(uiTtyMode, onComplete);
} catch (RemoteException e) {
throw new ImsException("setTTYMode()", e,
ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
@@ -1863,8 +1787,8 @@
return disconnectReasons;
}
- public int getImsServiceStatus() throws ImsException {
- return mImsServiceProxy.getFeatureStatus();
+ public int getImsServiceState() throws ImsException {
+ return mMmTelFeatureConnection.getFeatureState();
}
/**
@@ -1920,29 +1844,15 @@
/**
* Gets the call ID from the specified incoming call broadcast intent.
*
- * @param incomingCallIntent the incoming call broadcast intent
+ * @param incomingCallExtras the incoming call broadcast intent
* @return the call ID or null if the intent does not contain it
*/
- private static String getCallId(Intent incomingCallIntent) {
- if (incomingCallIntent == null) {
+ private static String getCallId(Bundle incomingCallExtras) {
+ if (incomingCallExtras == null) {
return null;
}
- return incomingCallIntent.getStringExtra(EXTRA_CALL_ID);
- }
-
- /**
- * Gets the service type from the specified incoming call broadcast intent.
- *
- * @param incomingCallIntent the incoming call broadcast intent
- * @return the session identifier or -1 if the intent does not contain it
- */
- private static int getImsSessionId(Intent incomingCallIntent) {
- if (incomingCallIntent == null) {
- return (-1);
- }
-
- return incomingCallIntent.getIntExtra(EXTRA_SERVICE_ID, -1);
+ return incomingCallExtras.getString(EXTRA_CALL_ID);
}
/**
@@ -1951,10 +1861,10 @@
*/
private void checkAndThrowExceptionIfServiceUnavailable()
throws ImsException {
- if (mImsServiceProxy == null || !mImsServiceProxy.isBinderAlive()) {
+ if (mMmTelFeatureConnection == null || !mMmTelFeatureConnection.isBinderAlive()) {
createImsService();
- if (mImsServiceProxy == null) {
+ if (mMmTelFeatureConnection == null) {
throw new ImsException("Service is unavailable",
ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
}
@@ -1968,30 +1878,21 @@
* 2) android.telephony.ims.ImsService implementation through ImsResolver.
*/
private void createImsService() {
- if (!mConfigDynamicBind) {
- // Deprecated method of binding
- Rlog.i(TAG, "Creating ImsService using ServiceManager");
- mImsServiceProxy = ImsServiceProxyCompat.create(mContext, mPhoneId, mDeathRecipient);
- } else {
- Rlog.i(TAG, "Creating ImsService using ImsResolver");
- mImsServiceProxy = ImsServiceProxy.create(mContext, mPhoneId);
- }
+ Rlog.i(TAG, "Creating ImsService");
+ mMmTelFeatureConnection = MmTelFeatureConnection.create(mContext, mPhoneId);
+
// Forwarding interface to tell mStatusCallbacks that the Proxy is unavailable.
- mImsServiceProxy.setStatusCallback(new ImsServiceProxy.IFeatureUpdate() {
+ mMmTelFeatureConnection.setStatusCallback(new MmTelFeatureConnection.IFeatureUpdate() {
@Override
public void notifyStateChanged() {
- mStatusCallbacks.forEach(ImsServiceProxy.IFeatureUpdate::notifyStateChanged);
+ mStatusCallbacks.forEach(MmTelFeatureConnection.IFeatureUpdate::notifyStateChanged);
}
@Override
public void notifyUnavailable() {
- mStatusCallbacks.forEach(ImsServiceProxy.IFeatureUpdate::notifyUnavailable);
+ mStatusCallbacks.forEach(MmTelFeatureConnection.IFeatureUpdate::notifyUnavailable);
}
});
- // We have created a new ImsService connection, signal for re-registration
- synchronized (mHasRegisteredLock) {
- mHasRegisteredForProxy = false;
- }
}
/**
@@ -1999,14 +1900,12 @@
* Use other methods, if applicable, instead of interacting with
* {@link ImsCallSession} directly.
*
- * @param serviceId a service id which is obtained from {@link ImsManager#open}
* @param profile a call profile to make the call
*/
- private ImsCallSession createCallSession(int serviceId,
- ImsCallProfile profile) throws ImsException {
+ private ImsCallSession createCallSession(ImsCallProfile profile) throws ImsException {
try {
// Throws an exception if the ImsService Feature is not ready to accept commands.
- return new ImsCallSession(mImsServiceProxy.createCallSession(serviceId, profile));
+ return new ImsCallSession(mMmTelFeatureConnection.createCallSession(profile));
} catch (RemoteException e) {
Rlog.w(TAG, "CreateCallSession: Error, remote exception: " + e.getMessage());
throw new ImsException("createCallSession()", e,
@@ -2031,13 +1930,9 @@
* Used for turning on IMS.if its off already
*/
private void turnOnIms() throws ImsException {
- checkAndThrowExceptionIfServiceUnavailable();
-
- try {
- mImsServiceProxy.turnOnIms();
- } catch (RemoteException e) {
- throw new ImsException("turnOnIms() ", e, ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
- }
+ TelephonyManager tm = (TelephonyManager)
+ mContext.getSystemService(Context.TELEPHONY_SERVICE);
+ tm.enableIms(mPhoneId);
}
private boolean isImsTurnOffAllowed() {
@@ -2048,25 +1943,36 @@
private void setLteFeatureValues(boolean turnOn) {
log("setLteFeatureValues: " + turnOn);
- try {
- ImsConfig config = getConfigInterface();
- if (config != null) {
- config.setFeatureValue(ImsConfig.FeatureConstants.FEATURE_TYPE_VOICE_OVER_LTE,
- TelephonyManager.NETWORK_TYPE_LTE, turnOn ? 1 : 0, mImsConfigListener);
+ CapabilityChangeRequest request = new CapabilityChangeRequest();
+ if (turnOn) {
+ request.addCapabilitiesToEnableForTech(
+ MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE,
+ ImsRegistrationImplBase.REGISTRATION_TECH_LTE);
+ } else {
+ request.addCapabilitiesToDisableForTech(
+ MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE,
+ ImsRegistrationImplBase.REGISTRATION_TECH_LTE);
+ }
- if (isVolteEnabledByPlatform()) {
- boolean ignoreDataEnabledChanged = getBooleanCarrierConfig(
- CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS);
- boolean enableViLte = turnOn && isVtEnabledByUser() &&
- (ignoreDataEnabledChanged || isDataEnabled());
- config.setFeatureValue(ImsConfig.FeatureConstants.FEATURE_TYPE_VIDEO_OVER_LTE,
- TelephonyManager.NETWORK_TYPE_LTE,
- enableViLte ? 1 : 0,
- mImsConfigListener);
- }
+ if (isVolteEnabledByPlatform()) {
+ boolean ignoreDataEnabledChanged = getBooleanCarrierConfig(
+ CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS);
+ boolean enableViLte = turnOn && isVtEnabledByUser() &&
+ (ignoreDataEnabledChanged || isDataEnabled());
+ if (enableViLte) {
+ request.addCapabilitiesToEnableForTech(
+ MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VIDEO,
+ ImsRegistrationImplBase.REGISTRATION_TECH_LTE);
+ } else {
+ request.addCapabilitiesToDisableForTech(
+ MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VIDEO,
+ ImsRegistrationImplBase.REGISTRATION_TECH_LTE);
}
- } catch (ImsException e) {
- loge("setLteFeatureValues: exception ", e);
+ }
+ try {
+ mMmTelFeatureConnection.changeEnabledCapabilities(request, null);
+ } catch (RemoteException e) {
+ Log.e(TAG, "setLteFeatureValues: Exception: " + e.getMessage());
}
}
@@ -2094,13 +2000,9 @@
* Once turned off, all calls will be over CS.
*/
private void turnOffIms() throws ImsException {
- checkAndThrowExceptionIfServiceUnavailable();
-
- try {
- mImsServiceProxy.turnOffIms();
- } catch (RemoteException e) {
- throw new ImsException("turnOffIms() ", e, ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
- }
+ TelephonyManager tm = (TelephonyManager)
+ mContext.getSystemService(Context.TELEPHONY_SERVICE);
+ tm.disableIms(mPhoneId);
}
private void addToRecentDisconnectReasons(ImsReasonInfo reason) {
@@ -2117,7 +2019,7 @@
private class ImsServiceDeathRecipient implements IBinder.DeathRecipient {
@Override
public void binderDied() {
- mImsServiceProxy = null;
+ mMmTelFeatureConnection = null;
mUt = null;
mConfig = null;
mEcbm = null;
@@ -2126,270 +2028,19 @@
}
/**
- * Stub implementation of the Registration listener that provides no functionality.
- */
- private class ImsRegistrationListenerBase extends IImsRegistrationListener.Stub {
-
- @Override
- public void registrationConnected() throws RemoteException {
- }
-
- @Override
- public void registrationProgressing() throws RemoteException {
- }
-
- @Override
- public void registrationConnectedWithRadioTech(int imsRadioTech) throws RemoteException {
- }
-
- @Override
- public void registrationProgressingWithRadioTech(int imsRadioTech) throws RemoteException {
- }
-
- @Override
- public void registrationDisconnected(ImsReasonInfo imsReasonInfo) throws RemoteException {
- }
-
- @Override
- public void registrationResumed() throws RemoteException {
- }
-
- @Override
- public void registrationSuspended() throws RemoteException {
- }
-
- @Override
- public void registrationServiceCapabilityChanged(int serviceClass, int event)
- throws RemoteException {
- }
-
- @Override
- public void registrationFeatureCapabilityChanged(int serviceClass, int[] enabledFeatures,
- int[] disabledFeatures) throws RemoteException {
- }
-
- @Override
- public void voiceMessageCountUpdate(int count) throws RemoteException {
- }
-
- @Override
- public void registrationAssociatedUriChanged(Uri[] uris) throws RemoteException {
- }
-
- @Override
- public void registrationChangeFailed(int targetAccessTech, ImsReasonInfo imsReasonInfo)
- throws RemoteException {
- }
- }
-
- /**
- * Adapter class for {@link IImsRegistrationListener}.
- */
- private class ImsRegistrationListenerProxy extends IImsRegistrationListener.Stub {
-
- @Deprecated
- public void registrationConnected() {
- if (DBG) {
- log("registrationConnected ::");
- }
-
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(l -> l.onImsConnected(
- ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN));
- }
- }
-
- @Deprecated
- public void registrationProgressing() {
- if (DBG) {
- log("registrationProgressing ::");
- }
-
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(l -> l.onImsProgressing(
- ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN));
- }
- }
-
- @Override
- public void registrationConnectedWithRadioTech(int imsRadioTech) {
- // Note: imsRadioTech value maps to RIL_RADIO_TECHNOLOGY
- // values in ServiceState.java.
- if (DBG) {
- log("registrationConnectedWithRadioTech :: imsRadioTech=" + imsRadioTech);
- }
-
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(l -> l.onImsConnected(imsRadioTech));
- }
- }
-
- @Override
- public void registrationProgressingWithRadioTech(int imsRadioTech) {
- // Note: imsRadioTech value maps to RIL_RADIO_TECHNOLOGY
- // values in ServiceState.java.
- if (DBG) {
- log("registrationProgressingWithRadioTech :: imsRadioTech=" + imsRadioTech);
- }
-
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(l -> l.onImsProgressing(imsRadioTech));
- }
- }
-
- @Override
- public void registrationDisconnected(ImsReasonInfo imsReasonInfo) {
- if (DBG) {
- log("registrationDisconnected :: imsReasonInfo" + imsReasonInfo);
- }
-
- addToRecentDisconnectReasons(imsReasonInfo);
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(l -> l.onImsDisconnected(imsReasonInfo));
- }
- }
-
- @Override
- public void registrationResumed() {
- if (DBG) {
- log("registrationResumed ::");
- }
-
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(ImsConnectionStateListener::onImsResumed);
- }
- }
-
- @Override
- public void registrationSuspended() {
- if (DBG) {
- log("registrationSuspended ::");
- }
-
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(ImsConnectionStateListener::onImsSuspended);
- }
- }
-
- @Override
- public void registrationServiceCapabilityChanged(int serviceClass, int event) {
- log("registrationServiceCapabilityChanged :: serviceClass=" +
- serviceClass + ", event=" + event);
-
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(l -> l.onImsConnected(
- ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN));
- }
- }
-
- @Override
- public void registrationFeatureCapabilityChanged(int serviceClass,
- int[] enabledFeatures, int[] disabledFeatures) {
- log("registrationFeatureCapabilityChanged :: serviceClass=" +
- serviceClass);
-
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(l -> l.onFeatureCapabilityChanged(serviceClass,
- enabledFeatures, disabledFeatures));
- }
- }
-
- @Override
- public void voiceMessageCountUpdate(int count) {
- log("voiceMessageCountUpdate :: count=" + count);
-
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(l -> l.onVoiceMessageCountChanged(count));
- }
- }
-
- @Override
- public void registrationAssociatedUriChanged(Uri[] uris) {
- if (DBG) log("registrationAssociatedUriChanged ::");
-
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(l -> l.registrationAssociatedUriChanged(uris));
- }
- }
-
- @Override
- public void registrationChangeFailed(int targetAccessTech, ImsReasonInfo imsReasonInfo) {
- if (DBG) log("registrationChangeFailed :: targetAccessTech=" + targetAccessTech +
- ", imsReasonInfo=" + imsReasonInfo);
-
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(l -> l.onRegistrationChangeFailed(targetAccessTech,
- imsReasonInfo));
- }
- }
- }
-
- // New API for Registration, uses ImsConnectionStateListener for backwards compatibility with
- // deprecated APIs.
- private class ImsRegistrationCallback extends IImsRegistrationCallback.Stub {
-
- @Override
- public void onRegistered(int imsRadioTech) {
- if (DBG) log("onRegistered ::");
-
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(l -> l.onRegistered(imsRadioTech));
- }
- }
-
- @Override
- public void onRegistering(int imsRadioTech) {
- if (DBG) log("onRegistering ::");
-
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(l -> l.onRegistering(imsRadioTech));
- }
- }
-
- @Override
- public void onDeregistered(ImsReasonInfo imsReasonInfo) {
- if (DBG) log("onDeregistered ::");
-
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(l -> l.onDeregistered(imsReasonInfo));
- }
- }
-
- @Override
- public void onTechnologyChangeFailed(int targetRadioTech, ImsReasonInfo imsReasonInfo) {
- if (DBG) log("onTechnologyChangeFailed :: targetAccessTech=" + targetRadioTech +
- ", imsReasonInfo=" + imsReasonInfo);
-
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(l -> l.onTechnologyChangeFailed(targetRadioTech,
- imsReasonInfo));
- }
- }
-
- @Override
- public void onSubscriberAssociatedUriChanged(Uri[] uris) {
- if (DBG) log("onSubscriberAssociatedUriChanged");
- synchronized (mRegistrationListeners) {
- mRegistrationListeners.forEach(l -> l.onSubscriberAssociatedUriChanged(uris));
- }
- }
- }
-
- /**
* Gets the ECBM interface to request ECBM exit.
*
- * @param serviceId a service id which is obtained from {@link ImsManager#open}
* @return the ECBM interface instance
* @throws ImsException if getting the ECBM interface results in an error
*/
- public ImsEcbm getEcbmInterface(int serviceId) throws ImsException {
+ public ImsEcbm getEcbmInterface() throws ImsException {
if (mEcbm != null && mEcbm.isBinderAlive()) {
return mEcbm;
}
checkAndThrowExceptionIfServiceUnavailable();
try {
- IImsEcbm iEcbm = mImsServiceProxy.getEcbmInterface();
+ IImsEcbm iEcbm = mMmTelFeatureConnection.getEcbmInterface();
if (iEcbm == null) {
throw new ImsException("getEcbmInterface()",
@@ -2406,7 +2057,7 @@
public void sendSms(int token, int messageRef, String format, String smsc, boolean isRetry,
byte[] pdu) throws ImsException {
try {
- mImsServiceProxy.sendSms(token, messageRef, format, smsc, isRetry, pdu);
+ mMmTelFeatureConnection.sendSms(token, messageRef, format, smsc, isRetry, pdu);
} catch (RemoteException e) {
throw new ImsException("sendSms()", e, ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
}
@@ -2414,7 +2065,7 @@
public void acknowledgeSms(int token, int messageRef, int result) throws ImsException {
try {
- mImsServiceProxy.acknowledgeSms(token, messageRef, result);
+ mMmTelFeatureConnection.acknowledgeSms(token, messageRef, result);
} catch (RemoteException e) {
throw new ImsException("acknowledgeSms()", e,
ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
@@ -2423,7 +2074,7 @@
public void acknowledgeSmsReport(int token, int messageRef, int result) throws ImsException{
try {
- mImsServiceProxy.acknowledgeSmsReport(token, messageRef, result);
+ mMmTelFeatureConnection.acknowledgeSmsReport(token, messageRef, result);
} catch (RemoteException e) {
throw new ImsException("acknowledgeSmsReport()", e,
ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
@@ -2432,7 +2083,7 @@
public String getSmsFormat() throws ImsException{
try {
- return mImsServiceProxy.getSmsFormat();
+ return mMmTelFeatureConnection.getSmsFormat();
} catch (RemoteException e) {
throw new ImsException("getSmsFormat()", e,
ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
@@ -2441,7 +2092,7 @@
public void setSmsListener(IImsSmsListener listener) throws ImsException {
try {
- mImsServiceProxy.setSmsListener(listener);
+ mMmTelFeatureConnection.setSmsListener(listener);
} catch (RemoteException e) {
throw new ImsException("setSmsListener()", e,
ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
@@ -2468,18 +2119,17 @@
/**
* Gets the Multi-Endpoint interface to subscribe to multi-enpoint notifications..
*
- * @param serviceId a service id which is obtained from {@link ImsManager#open}
* @return the multi-endpoint interface instance
* @throws ImsException if getting the multi-endpoint interface results in an error
*/
- public ImsMultiEndpoint getMultiEndpointInterface(int serviceId) throws ImsException {
+ public ImsMultiEndpoint getMultiEndpointInterface() throws ImsException {
if (mMultiEndpoint != null && mMultiEndpoint.isBinderAlive()) {
return mMultiEndpoint;
}
checkAndThrowExceptionIfServiceUnavailable();
try {
- IImsMultiEndpoint iImsMultiEndpoint = mImsServiceProxy.getMultiEndpointInterface();
+ IImsMultiEndpoint iImsMultiEndpoint = mMmTelFeatureConnection.getMultiEndpointInterface();
if (iImsMultiEndpoint == null) {
throw new ImsException("getMultiEndpointInterface()",
@@ -2592,7 +2242,7 @@
pw.println("ImsManager:");
pw.println(" mPhoneId = " + mPhoneId);
pw.println(" mConfigUpdated = " + mConfigUpdated);
- pw.println(" mImsServiceProxy = " + mImsServiceProxy);
+ pw.println(" mImsServiceProxy = " + mMmTelFeatureConnection);
pw.println(" mDataEnabled = " + isDataEnabled());
pw.println(" ignoreDataEnabledChanged = " + getBooleanCarrierConfig(
CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS));
diff --git a/src/java/com/android/ims/ImsServiceProxyCompat.java b/src/java/com/android/ims/ImsServiceProxyCompat.java
deleted file mode 100644
index d5f211a..0000000
--- a/src/java/com/android/ims/ImsServiceProxyCompat.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.ims;
-
-import android.app.PendingIntent;
-import android.content.Context;
-import android.os.IBinder;
-import android.os.Message;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.telephony.Rlog;
-import android.telephony.TelephonyManager;
-import android.telephony.ims.feature.ImsFeature;
-
-import com.android.ims.internal.IImsCallSession;
-import com.android.ims.internal.IImsCallSessionListener;
-import com.android.ims.internal.IImsConfig;
-import com.android.ims.internal.IImsEcbm;
-import com.android.ims.internal.IImsMMTelFeature;
-import com.android.ims.internal.IImsMultiEndpoint;
-import com.android.ims.internal.IImsRegistrationListener;
-import com.android.ims.internal.IImsService;
-import com.android.ims.internal.IImsUt;
-
-/**
- * Compatibility class that implements the new ImsService MMTelFeature interface, but
- * uses the old IImsService interface to support older devices that implement the deprecated
- * opt/net/ims interface.
- * @hide
- */
-
-public class ImsServiceProxyCompat extends ImsServiceProxy {
-
- private static final int SERVICE_ID = ImsFeature.MMTEL;
-
- /**
- * For accessing the IMS related service.
- * Internal use only.
- * @hide
- */
- private static final String IMS_SERVICE = "ims";
-
- public static ImsServiceProxyCompat create(Context context, int slotId,
- IBinder.DeathRecipient recipient) {
- IBinder binder = ServiceManager.checkService(IMS_SERVICE);
-
- if (binder != null) {
- try {
- binder.linkToDeath(recipient, 0);
- } catch (RemoteException e) {
- }
- }
-
- // If the proxy is created with a null binder, subsequent calls that depend on a live
- // binder will fail, causing this structure to be torn down and created again.
- return new ImsServiceProxyCompat(context, slotId, binder);
- }
-
- public ImsServiceProxyCompat(Context context, int slotId, IBinder binder) {
- super(context, slotId, binder, SERVICE_ID);
- }
-
- @Override
- public int startSession(PendingIntent incomingCallIntent, IImsRegistrationListener listener)
- throws RemoteException {
- checkBinderConnection();
- return getServiceInterface(mBinder).open(mSlotId, ImsFeature.MMTEL, incomingCallIntent,
- listener);
- }
-
- @Override
- public void endSession(int sessionId) throws RemoteException {
- checkBinderConnection();
- getServiceInterface(mBinder).close(sessionId);
- }
-
- @Override
- public boolean isConnected(int callServiceType, int callType)
- throws RemoteException {
- checkBinderConnection();
- return getServiceInterface(mBinder).isConnected(SERVICE_ID, callServiceType, callType);
- }
-
- @Override
- public boolean isOpened() throws RemoteException {
- checkBinderConnection();
- return getServiceInterface(mBinder).isOpened(SERVICE_ID);
- }
-
- @Override
- public void addRegistrationListener(IImsRegistrationListener listener)
- throws RemoteException {
- checkBinderConnection();
- getServiceInterface(mBinder).addRegistrationListener(mSlotId, ImsFeature.MMTEL, listener);
- }
-
- @Override
- public void removeRegistrationListener(IImsRegistrationListener listener)
- throws RemoteException {
- // Not Implemented in old ImsService. If the registration listener becomes invalid, the
- // ImsService will remove.
- }
-
- @Override
- public ImsCallProfile createCallProfile(int sessionId, int callServiceType, int callType)
- throws RemoteException {
- checkBinderConnection();
- return getServiceInterface(mBinder).createCallProfile(sessionId, callServiceType, callType);
- }
-
- @Override
- public IImsCallSession createCallSession(int sessionId, ImsCallProfile profile)
- throws RemoteException {
- checkBinderConnection();
- return getServiceInterface(mBinder).createCallSession(sessionId, profile, null);
- }
-
- @Override
- public IImsCallSession getPendingCallSession(int sessionId, String callId)
- throws RemoteException {
- checkBinderConnection();
- return getServiceInterface(mBinder).getPendingCallSession(sessionId, callId);
- }
-
- @Override
- public IImsUt getUtInterface() throws RemoteException {
- checkBinderConnection();
- return getServiceInterface(mBinder).getUtInterface(SERVICE_ID);
- }
-
- @Override
- public IImsConfig getConfigInterface() throws RemoteException {
- checkBinderConnection();
- return getServiceInterface(mBinder).getConfigInterface(mSlotId);
- }
-
- @Override
- public void turnOnIms() throws RemoteException {
- checkBinderConnection();
- getServiceInterface(mBinder).turnOnIms(mSlotId);
- }
-
- @Override
- public void turnOffIms() throws RemoteException {
- checkBinderConnection();
- getServiceInterface(mBinder).turnOffIms(mSlotId);
- }
-
- @Override
- public IImsEcbm getEcbmInterface() throws RemoteException {
- checkBinderConnection();
- return getServiceInterface(mBinder).getEcbmInterface(SERVICE_ID);
- }
-
- @Override
- public void setUiTTYMode(int uiTtyMode, Message onComplete)
- throws RemoteException {
- checkBinderConnection();
- getServiceInterface(mBinder).setUiTTYMode(SERVICE_ID, uiTtyMode, onComplete);
- }
-
- @Override
- public IImsMultiEndpoint getMultiEndpointInterface() throws RemoteException {
- checkBinderConnection();
- return getServiceInterface(mBinder).getMultiEndpointInterface(SERVICE_ID);
- }
- @Override
- public int getFeatureStatus() {
- return ImsFeature.STATE_READY;
- }
-
- @Override
- public boolean isBinderAlive() {
- return mBinder != null && mBinder.isBinderAlive();
- }
-
- private IImsService getServiceInterface(IBinder b) {
- return IImsService.Stub.asInterface(b);
- }
-}
diff --git a/src/java/com/android/ims/MmTelFeatureConnection.java b/src/java/com/android/ims/MmTelFeatureConnection.java
new file mode 100644
index 0000000..00dec65
--- /dev/null
+++ b/src/java/com/android/ims/MmTelFeatureConnection.java
@@ -0,0 +1,614 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.ims;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.net.Uri;
+import android.os.IBinder;
+import android.os.Message;
+import android.os.RemoteException;
+import android.telephony.Rlog;
+import android.telephony.TelephonyManager;
+import android.telephony.ims.aidl.IImsConfig;
+import android.telephony.ims.aidl.IImsMmTelFeature;
+import android.telephony.ims.aidl.IImsRegistration;
+import android.telephony.ims.aidl.IImsRegistrationCallback;
+import android.telephony.ims.aidl.IImsSmsListener;
+import android.telephony.ims.feature.CapabilityChangeRequest;
+import android.telephony.ims.feature.ImsFeature;
+import android.telephony.ims.feature.MmTelFeature;
+import android.telephony.ims.stub.ImsRegistrationImplBase;
+import android.telephony.ims.stub.ImsSmsImplBase;
+import android.util.Log;
+
+import com.android.ims.internal.IImsCallSession;
+import com.android.ims.internal.IImsEcbm;
+import com.android.ims.internal.IImsMultiEndpoint;
+import com.android.ims.internal.IImsServiceFeatureCallback;
+import com.android.ims.internal.IImsUt;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * A container of the IImsServiceController binder, which implements all of the ImsFeatures that
+ * the platform currently supports: MMTel and RCS.
+ * @hide
+ */
+
+public class MmTelFeatureConnection {
+
+ protected static final String TAG = "MmTelFeatureConnection";
+ protected final int mSlotId;
+ protected IBinder mBinder;
+ private Context mContext;
+
+ // Start by assuming the proxy is available for usage.
+ private volatile boolean mIsAvailable = true;
+ // ImsFeature Status from the ImsService. Cached.
+ private Integer mFeatureStateCached = null;
+ private IFeatureUpdate mStatusCallback;
+ private final Object mLock = new Object();
+
+ private MmTelFeature.Listener mMmTelFeatureListener;
+
+ private abstract class CallbackAdapterManager<T> {
+ private static final String TAG = "CallbackAdapterManager";
+
+ protected final Set<T> mLocalCallbacks = new HashSet<>();
+ private boolean mHasConnected = false;
+
+ public void addCallback(T localCallback) throws RemoteException {
+ // We only one one binding to the ImsService per process.
+ // Store any more locally.
+ synchronized (mLock) {
+ if(!mHasConnected) {
+ // throws a RemoteException if a connection can not be established.
+ if(createConnection()) {
+ mHasConnected = true;
+ } else {
+ throw new RemoteException("Can not create connection!");
+ }
+ }
+ Log.i(TAG, "Local callback added: " + localCallback);
+ mLocalCallbacks.add(localCallback);
+ }
+ }
+
+ public void removeCallback(T localCallback) {
+ // We only maintain one binding to the ImsService per process.
+ synchronized (mLock) {
+ Log.i(TAG, "Local callback removed: " + localCallback);
+ mLocalCallbacks.remove(localCallback);
+ // If we have removed all local callbacks, remove callback to ImsService.
+ if(mHasConnected) {
+ if (mLocalCallbacks.isEmpty()) {
+ removeConnection();
+ mHasConnected = false;
+ }
+ }
+ }
+ }
+
+ public void close() {
+ synchronized (mLock) {
+ if (mHasConnected) {
+ removeConnection();
+ // Still mark the connection as disconnected, even if this fails.
+ mHasConnected = false;
+ }
+ Log.i(TAG, "Closing connection and clearing callbacks");
+ mLocalCallbacks.clear();
+ }
+ }
+
+ abstract boolean createConnection() throws RemoteException;
+
+ abstract void removeConnection();
+ }
+ private ImsRegistrationCallbackAdapter mRegistrationCallbackManager
+ = new ImsRegistrationCallbackAdapter();
+ private class ImsRegistrationCallbackAdapter
+ extends CallbackAdapterManager<ImsRegistrationImplBase.Callback> {
+ private final RegistrationCallbackAdapter mRegistrationCallbackAdapter
+ = new RegistrationCallbackAdapter();
+
+ private class RegistrationCallbackAdapter extends IImsRegistrationCallback.Stub {
+
+ @Override
+ public void onRegistered(int imsRadioTech) {
+ Log.i(TAG, "onRegistered ::");
+
+ synchronized (mLock) {
+ mLocalCallbacks.forEach(l -> l.onRegistered(imsRadioTech));
+ }
+ }
+
+ @Override
+ public void onRegistering(int imsRadioTech) {
+ Log.i(TAG, "onRegistering ::");
+
+ synchronized (mLock) {
+ mLocalCallbacks.forEach(l -> l.onRegistering(imsRadioTech));
+ }
+ }
+
+ @Override
+ public void onDeregistered(ImsReasonInfo imsReasonInfo) {
+ Log.i(TAG, "onDeregistered ::");
+
+ synchronized (mLock) {
+ mLocalCallbacks.forEach(l -> l.onDeregistered(imsReasonInfo));
+ }
+ }
+
+ @Override
+ public void onTechnologyChangeFailed(int targetRadioTech, ImsReasonInfo imsReasonInfo) {
+ Log.i(TAG, "onTechnologyChangeFailed :: targetAccessTech=" + targetRadioTech +
+ ", imsReasonInfo=" + imsReasonInfo);
+
+ synchronized (mLock) {
+ mLocalCallbacks.forEach(l -> l.onTechnologyChangeFailed(targetRadioTech,
+ imsReasonInfo));
+ }
+ }
+
+ @Override
+ public void onSubscriberAssociatedUriChanged(Uri[] uris) {
+ Log.i(TAG, "onSubscriberAssociatedUriChanged");
+ synchronized (mLock) {
+ mLocalCallbacks.forEach(l -> l.onSubscriberAssociatedUriChanged(uris));
+ }
+ }
+ }
+
+ @Override
+ boolean createConnection() throws RemoteException {
+ IImsRegistration imsRegistration = getRegistration();
+ if (imsRegistration != null) {
+ getRegistration().addRegistrationCallback(mRegistrationCallbackAdapter);
+ return true;
+ } else {
+ Log.e(TAG, "ImsRegistration is null");
+ return false;
+ }
+ }
+
+ @Override
+ void removeConnection() {
+ IImsRegistration imsRegistration = getRegistration();
+ if (imsRegistration != null) {
+ try {
+ getRegistration().addRegistrationCallback(mRegistrationCallbackAdapter);
+ } catch (RemoteException e) {
+ Log.w(TAG, "removeConnection: couldn't remove registration callback");
+ }
+ } else {
+ Log.e(TAG, "ImsRegistration is null");
+ }
+ }
+ }
+
+ private final CapabilityCallbackManager mCapabilityCallbackManager
+ = new CapabilityCallbackManager();
+ private class CapabilityCallbackManager
+ extends CallbackAdapterManager<ImsFeature.CapabilityCallback> {
+ private final CapabilityCallbackAdapter mCallbackAdapter = new CapabilityCallbackAdapter();
+
+ private class CapabilityCallbackAdapter extends ImsFeature.CapabilityCallback {
+ // Called when the Capabilities Status on this connection have changed.
+ @Override
+ public void onCapabilitiesStatusChanged(ImsFeature.Capabilities config) {
+ synchronized (mLock) {
+ mLocalCallbacks.forEach(
+ callback -> callback.onCapabilitiesStatusChanged(config));
+ }
+ }
+ }
+
+ @Override
+ boolean createConnection() throws RemoteException {
+ IImsMmTelFeature binder = getServiceInterface(mBinder);
+ if (binder != null) {
+ binder.addCapabilityCallback(mCallbackAdapter);
+ return true;
+ } else {
+ Log.w(TAG, "create: Couldn't get IImsMmTelFeature binder");
+ return false;
+ }
+ }
+
+ @Override
+ void removeConnection() {
+ IImsMmTelFeature binder = getServiceInterface(mBinder);
+ if (binder != null) {
+ try {
+ binder.removeCapabilityCallback(mCallbackAdapter);
+ } catch (RemoteException e) {
+ Log.w(TAG, "remove: IImsMmTelFeature binder is dead");
+ }
+ } else {
+ Log.w(TAG, "remove: Couldn't get IImsMmTelFeature binder");
+ }
+ }
+ }
+
+
+ public static MmTelFeatureConnection create(Context context , int slotId) {
+ MmTelFeatureConnection serviceProxy = new MmTelFeatureConnection(context, slotId);
+
+ TelephonyManager tm = getTelephonyManager(context);
+ if (tm == null) {
+ Rlog.w(TAG, "create: TelephonyManager is null!");
+ // Binder can be unset in this case because it will be torn down/recreated as part of
+ // a retry mechanism until the serviceProxy binder is set successfully.
+ return serviceProxy;
+ }
+
+ IImsMmTelFeature binder = tm.getImsMmTelFeatureAndListen(slotId,
+ serviceProxy.getListener());
+ if (binder != null) {
+ serviceProxy.setBinder(binder.asBinder());
+ // Trigger the cache to be updated for feature status.
+ serviceProxy.getFeatureState();
+ } else {
+ Rlog.w(TAG, "create: binder is null! Slot Id: " + slotId);
+ }
+ return serviceProxy;
+ }
+
+ public static TelephonyManager getTelephonyManager(Context context) {
+ return (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+ }
+
+ public interface IFeatureUpdate {
+ /**
+ * Called when the ImsFeature has changed its state. Use
+ * {@link ImsFeature#getFeatureState()} to get the new state.
+ */
+ void notifyStateChanged();
+
+ /**
+ * Called when the ImsFeature has become unavailable due to the binder switching or app
+ * crashing. A new ImsServiceProxy should be requested for that feature.
+ */
+ void notifyUnavailable();
+ }
+
+ private final IImsServiceFeatureCallback mListenerBinder =
+ new IImsServiceFeatureCallback.Stub() {
+
+ @Override
+ public void imsFeatureCreated(int slotId, int feature) throws RemoteException {
+ // The feature has been re-enabled. This may happen when the service crashes.
+ synchronized (mLock) {
+ if (!mIsAvailable && mSlotId == slotId && feature == ImsFeature.FEATURE_MMTEL) {
+ Log.i(TAG, "Feature enabled on slotId: " + slotId + " for feature: " +
+ feature);
+ mIsAvailable = true;
+ }
+ }
+ }
+
+ @Override
+ public void imsFeatureRemoved(int slotId, int feature) throws RemoteException {
+ synchronized (mLock) {
+ if (mIsAvailable && mSlotId == slotId && feature == ImsFeature.FEATURE_MMTEL) {
+ Log.i(TAG, "Feature disabled on slotId: " + slotId + " for feature: " +
+ feature);
+ mIsAvailable = false;
+ if (mStatusCallback != null) {
+ mStatusCallback.notifyUnavailable();
+ }
+ }
+ }
+ }
+
+ @Override
+ public void imsStatusChanged(int slotId, int feature, int status) throws RemoteException {
+ synchronized (mLock) {
+ Log.i(TAG, "imsStatusChanged: slot: " + slotId + " feature: " + feature +
+ " status: " + status);
+ if (mSlotId == slotId && feature == ImsFeature.FEATURE_MMTEL) {
+ mFeatureStateCached = status;
+ if (mStatusCallback != null) {
+ mStatusCallback.notifyStateChanged();
+ }
+ }
+ }
+ }
+ };
+
+ public MmTelFeatureConnection(Context context, int slotId) {
+ mSlotId = slotId;
+ mContext = context;
+ }
+
+ private @Nullable IImsRegistration getRegistration() {
+ TelephonyManager tm = getTelephonyManager(mContext);
+ return tm != null ? tm.getImsRegistration(mSlotId, ImsFeature.FEATURE_MMTEL) : null;
+ }
+
+ private IImsConfig getConfig() {
+ TelephonyManager tm = getTelephonyManager(mContext);
+ return tm != null ? tm.getImsConfig(mSlotId, ImsFeature.FEATURE_MMTEL) : null;
+ }
+
+ public IImsServiceFeatureCallback getListener() {
+ return mListenerBinder;
+ }
+
+ public void setBinder(IBinder binder) {
+ mBinder = binder;
+ }
+
+ /**
+ * Opens the connection to the {@link MmTelFeature} and establishes a listener back to the
+ * framework. Calling this method multiple times will reset the listener attached to the
+ * {@link MmTelFeature}.
+ * @param listener A {@link MmTelFeature.Listener} that will be used by the {@link MmTelFeature}
+ * to notify the framework of updates.
+ */
+ public void openConnection(MmTelFeature.Listener listener) throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ mMmTelFeatureListener = listener;
+ getServiceInterface(mBinder).setListener(mMmTelFeatureListener);
+ }
+ }
+
+ public void closeConnection() {
+ mRegistrationCallbackManager.close();
+ mCapabilityCallbackManager.close();
+ try {
+ getServiceInterface(mBinder).setListener(null);
+ } catch (RemoteException e) {
+ Log.w(TAG, "closeConnection: couldn't remove listener!");
+ }
+ }
+
+ public void addRegistrationCallback(ImsRegistrationImplBase.Callback callback)
+ throws RemoteException {
+ mRegistrationCallbackManager.addCallback(callback);
+ }
+
+ public void removeRegistrationCallback(ImsRegistrationImplBase.Callback callback)
+ throws RemoteException {
+ mRegistrationCallbackManager.removeCallback(callback);
+ }
+
+ public void addCapabilityCallback(ImsFeature.CapabilityCallback callback)
+ throws RemoteException {
+ mCapabilityCallbackManager.addCallback(callback);
+ }
+
+ public void removeCapabilityCallback(ImsFeature.CapabilityCallback callback)
+ throws RemoteException {
+ mCapabilityCallbackManager.removeCallback(callback);
+ }
+
+ public void changeEnabledCapabilities(CapabilityChangeRequest request,
+ ImsFeature.CapabilityCallback callback) throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ getServiceInterface(mBinder).changeCapabilitiesConfiguration(request, callback);
+ }
+ }
+
+ public void queryEnabledCapabilities(int capability, int radioTech,
+ ImsFeature.CapabilityCallback callback) throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ getServiceInterface(mBinder).queryCapabilityConfiguration(capability, radioTech,
+ callback);
+ }
+ }
+
+ public MmTelFeature.MmTelCapabilities queryCapabilityStatus() throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ return new MmTelFeature.MmTelCapabilities(
+ getServiceInterface(mBinder).queryCapabilityStatus());
+ }
+ }
+
+ public ImsCallProfile createCallProfile(int callServiceType, int callType)
+ throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ return getServiceInterface(mBinder).createCallProfile(callServiceType, callType);
+ }
+ }
+
+ public IImsCallSession createCallSession(ImsCallProfile profile)
+ throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ return getServiceInterface(mBinder).createCallSession(profile);
+ }
+ }
+
+ public IImsUt getUtInterface() throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ return getServiceInterface(mBinder).getUtInterface();
+ }
+ }
+
+ public IImsConfig getConfigInterface() throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ return getConfig();
+ }
+ }
+
+ public @ImsRegistrationImplBase.ImsRegistrationTech int getRegistrationTech()
+ throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ IImsRegistration registration = getRegistration();
+ if (registration != null) {
+ return registration.getRegistrationTechnology();
+ } else {
+ return ImsRegistrationImplBase.REGISTRATION_TECH_NONE;
+ }
+ }
+ }
+
+ public IImsEcbm getEcbmInterface() throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ return getServiceInterface(mBinder).getEcbmInterface();
+ }
+ }
+
+ public void setUiTTYMode(int uiTtyMode, Message onComplete)
+ throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ getServiceInterface(mBinder).setUiTtyMode(uiTtyMode, onComplete);
+ }
+ }
+
+ public IImsMultiEndpoint getMultiEndpointInterface() throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ return getServiceInterface(mBinder).getMultiEndpointInterface();
+ }
+ }
+
+ public void sendSms(int token, int messageRef, String format, String smsc, boolean isRetry,
+ byte[] pdu) throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ getServiceInterface(mBinder).sendSms(token, messageRef, format, smsc, isRetry,
+ pdu);
+ }
+ }
+
+ public void acknowledgeSms(int token, int messageRef,
+ @ImsSmsImplBase.SendStatusResult int result) throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ getServiceInterface(mBinder).acknowledgeSms(token, messageRef, result);
+ }
+ }
+
+ public void acknowledgeSmsReport(int token, int messageRef,
+ @ImsSmsImplBase.StatusReportResult int result) throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ getServiceInterface(mBinder).acknowledgeSmsReport(token, messageRef, result);
+ }
+ }
+
+ public String getSmsFormat() throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ return getServiceInterface(mBinder).getSmsFormat();
+ }
+ }
+
+ public void setSmsListener(IImsSmsListener listener) throws RemoteException {
+ synchronized (mLock) {
+ checkServiceIsReady();
+ getServiceInterface(mBinder).setSmsListener(listener);
+ }
+ }
+
+ /**
+ * @return an integer describing the current Feature Status, defined in
+ * {@link ImsFeature.ImsState}.
+ */
+ public int getFeatureState() {
+ synchronized (mLock) {
+ if (isBinderAlive() && mFeatureStateCached != null) {
+ Log.i(TAG, "getFeatureState - returning cached: " + mFeatureStateCached);
+ return mFeatureStateCached;
+ }
+ }
+ // Don't synchronize on Binder call.
+ Integer status = retrieveFeatureState();
+ synchronized (mLock) {
+ if (status == null) {
+ return ImsFeature.STATE_UNAVAILABLE;
+ }
+ // Cache only non-null value for feature status.
+ mFeatureStateCached = status;
+ }
+ Log.i(TAG, "getFeatureState - returning " + status);
+ return status;
+ }
+
+ /**
+ * Internal method used to retrieve the feature status from the corresponding ImsService.
+ */
+ private Integer retrieveFeatureState() {
+ if (mBinder != null) {
+ try {
+ return getServiceInterface(mBinder).getFeatureState();
+ } catch (RemoteException e) {
+ // Status check failed, don't update cache
+ }
+ }
+ return null;
+ }
+
+ /**
+ * @param c Callback that will fire when the feature status has changed.
+ */
+ public void setStatusCallback(IFeatureUpdate c) {
+ mStatusCallback = c;
+ }
+
+ /**
+ * @return Returns true if the ImsService is ready to take commands, false otherwise. If this
+ * method returns false, it doesn't mean that the Binder connection is not available (use
+ * {@link #isBinderReady()} to check that), but that the ImsService is not accepting commands
+ * at this time.
+ *
+ * For example, for DSDS devices, only one slot can be {@link ImsFeature#STATE_READY} to take
+ * commands at a time, so the other slot must stay at {@link ImsFeature#STATE_UNAVAILABLE}.
+ */
+ public boolean isBinderReady() {
+ return isBinderAlive() && getFeatureState() == ImsFeature.STATE_READY;
+ }
+
+ /**
+ * @return false if the binder connection is no longer alive.
+ */
+ public boolean isBinderAlive() {
+ return mIsAvailable && mBinder != null && mBinder.isBinderAlive();
+ }
+
+ protected void checkServiceIsReady() throws RemoteException {
+ if (!isBinderReady()) {
+ throw new RemoteException("ImsServiceProxy is not ready to accept commands.");
+ }
+ }
+
+ private IImsMmTelFeature getServiceInterface(IBinder b) {
+ return IImsMmTelFeature.Stub.asInterface(b);
+ }
+
+ protected void checkBinderConnection() throws RemoteException {
+ if (!isBinderAlive()) {
+ throw new RemoteException("ImsServiceProxy is not available for that feature.");
+ }
+ }
+}