Move RCS provisioning changed callback logic to RcsProvisioningMonitor
As there may be separated services to provide MMTEl and RCS features,
RCS provioning callback should not depend on MMTEL feature.
Bug: 177018241
Test: atest TeleServiceTests:com.android.phone.RcsProvisioningMonitorTest
Test: atest CtsTelephonyTestCases:android.telephony.ims.cts.ImsServiceTest
Merged-In: I532bbf851b2ac49fd59a22df0a7576239e30360f
Change-Id: I532bbf851b2ac49fd59a22df0a7576239e30360f
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index b8f87ea..f1ceca9 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -9571,10 +9571,11 @@
final long identity = Binder.clearCallingIdentity();
try {
- ImsManager.getInstance(mApp, getSlotIndexOrException(subId))
- .addRcsProvisioningCallbackForSubscription(callback, subId);
- } catch (ImsException e) {
- throw new ServiceSpecificException(e.getCode());
+ if (!RcsProvisioningMonitor.getInstance()
+ .registerRcsProvisioningChangedCallback(subId, callback)) {
+ throw new ServiceSpecificException(ImsException.CODE_ERROR_UNSUPPORTED_OPERATION,
+ "Service not available for the subscription.");
+ }
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -9598,11 +9599,8 @@
final long identity = Binder.clearCallingIdentity();
try {
- ImsManager.getInstance(mApp, getSlotIndexOrException(subId))
- .removeRcsProvisioningCallbackForSubscription(callback, subId);
- } catch (ImsException e) {
- Log.i(LOG_TAG, "unregisterRcsProvisioningChangedCallback: " + subId
- + "is inactive, ignoring unregister.");
+ RcsProvisioningMonitor.getInstance()
+ .unregisterRcsProvisioningChangedCallback(subId, callback);
} finally {
Binder.restoreCallingIdentity(identity);
}
diff --git a/src/com/android/phone/RcsProvisioningMonitor.java b/src/com/android/phone/RcsProvisioningMonitor.java
index c4f367d..7b51eeb 100644
--- a/src/com/android/phone/RcsProvisioningMonitor.java
+++ b/src/com/android/phone/RcsProvisioningMonitor.java
@@ -36,19 +36,18 @@
import android.telephony.ims.ProvisioningManager;
import android.telephony.ims.RcsConfig;
import android.telephony.ims.aidl.IImsConfig;
+import android.telephony.ims.aidl.IRcsConfigCallback;
import android.telephony.ims.feature.ImsFeature;
import android.text.TextUtils;
-import com.android.ims.ImsManager;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.CollectionUtils;
import com.android.telephony.Rlog;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executor;
@@ -69,10 +68,8 @@
private final PhoneGlobals mPhone;
private final Handler mHandler;
- //cache the rcs config per sub id
- private final Map<Integer, byte[]> mConfigs = Collections.synchronizedMap(new HashMap<>());
- //cache the single registration config per sub id
- private final ConcurrentHashMap<Integer, Integer> mSingleRegistrations =
+ // Cache the RCS provsioning info and related sub id
+ private final ConcurrentHashMap<Integer, RcsProvisioningInfo> mRcsProvisioningInfos =
new ConcurrentHashMap<>();
private Boolean mDeviceSingleRegistrationEnabledOverride;
private final HashMap<Integer, Boolean> mCarrierSingleRegistrationEnabledOverride =
@@ -185,6 +182,105 @@
}
}
+ private final class RcsProvisioningInfo {
+ private int mSubId;
+ private volatile int mSingleRegistrationCapability;
+ private volatile byte[] mConfig;
+ private HashSet<IRcsConfigCallback> mRcsConfigCallbacks;
+
+ RcsProvisioningInfo(int subId, int singleRegistrationCapability, byte[] config) {
+ mSubId = subId;
+ mSingleRegistrationCapability = singleRegistrationCapability;
+ mConfig = config;
+ mRcsConfigCallbacks = new HashSet<>();
+ }
+
+ void setSingleRegistrationCapability(int singleRegistrationCapability) {
+ mSingleRegistrationCapability = singleRegistrationCapability;
+ }
+
+ int getSingleRegistrationCapability() {
+ return mSingleRegistrationCapability;
+ }
+
+ void setConfig(byte[] config) {
+ mConfig = config;
+ }
+
+ byte[] getConfig() {
+ return mConfig;
+ }
+
+ boolean addRcsConfigCallback(IRcsConfigCallback cb) {
+ IImsConfig imsConfig = getIImsConfig(mSubId, ImsFeature.FEATURE_RCS);
+ if (imsConfig == null) {
+ logd("fail to addRcsConfigCallback as imsConfig is null");
+ return false;
+ }
+
+ synchronized (mRcsConfigCallbacks) {
+ try {
+ imsConfig.addRcsConfigCallback(cb);
+ } catch (RemoteException e) {
+ loge("fail to addRcsConfigCallback due to " + e);
+ return false;
+ }
+ mRcsConfigCallbacks.add(cb);
+ }
+ return true;
+ }
+
+ boolean removeRcsConfigCallback(IRcsConfigCallback cb) {
+ boolean result = true;
+ IImsConfig imsConfig = getIImsConfig(mSubId, ImsFeature.FEATURE_RCS);
+
+ synchronized (mRcsConfigCallbacks) {
+ if (imsConfig != null) {
+ try {
+ imsConfig.removeRcsConfigCallback(cb);
+ } catch (RemoteException e) {
+ loge("fail to removeRcsConfigCallback due to " + e);
+ }
+ } else {
+ // Return false but continue to remove the callback
+ result = false;
+ }
+
+ try {
+ cb.onRemoved();
+ } catch (RemoteException e) {
+ logd("Failed to notify onRemoved due to dead binder of " + cb);
+ }
+ mRcsConfigCallbacks.remove(cb);
+ }
+ return result;
+ }
+
+ void clear() {
+ setConfig(null);
+ synchronized (mRcsConfigCallbacks) {
+ IImsConfig imsConfig = getIImsConfig(mSubId, ImsFeature.FEATURE_RCS);
+ Iterator<IRcsConfigCallback> it = mRcsConfigCallbacks.iterator();
+ while (it.hasNext()) {
+ IRcsConfigCallback cb = it.next();
+ if (imsConfig != null) {
+ try {
+ imsConfig.removeRcsConfigCallback(cb);
+ } catch (RemoteException e) {
+ loge("fail to removeRcsConfigCallback due to " + e);
+ }
+ }
+ try {
+ cb.onRemoved();
+ } catch (RemoteException e) {
+ logd("Failed to notify onRemoved due to dead binder of " + cb);
+ }
+ it.remove();
+ }
+ }
+ }
+ }
+
@VisibleForTesting
public RcsProvisioningMonitor(PhoneGlobals app, Looper looper, RoleManagerAdapter roleManager) {
mPhone = app;
@@ -252,15 +348,19 @@
*/
@VisibleForTesting
public byte[] getConfig(int subId) {
- return mConfigs.get(subId);
+ if (mRcsProvisioningInfos.containsKey(subId)) {
+ return mRcsProvisioningInfos.get(subId).getConfig();
+ }
+ return null;
}
/**
* Returns whether Rcs Volte single registration is enabled for the sub.
*/
public boolean isRcsVolteSingleRegistrationEnabled(int subId) {
- if (mSingleRegistrations.containsKey(subId)) {
- return mSingleRegistrations.get(subId) == ProvisioningManager.STATUS_CAPABLE;
+ if (mRcsProvisioningInfos.containsKey(subId)) {
+ return mRcsProvisioningInfos.get(subId).getSingleRegistrationCapability()
+ == ProvisioningManager.STATUS_CAPABLE;
}
return false;
}
@@ -281,6 +381,34 @@
}
/**
+ * Called when the application registers rcs provisioning changed callback
+ */
+ public boolean registerRcsProvisioningChangedCallback(int subId, IRcsConfigCallback cb) {
+ RcsProvisioningInfo info = mRcsProvisioningInfos.get(subId);
+ // should not happen in normal case
+ if (info == null) {
+ logd("fail to register rcs provisioning changed due to subscription unavailable");
+ return false;
+ }
+
+ return info.addRcsConfigCallback(cb);
+ }
+
+ /**
+ * Called when the application unregisters rcs provisioning changed callback
+ */
+ public boolean unregisterRcsProvisioningChangedCallback(int subId, IRcsConfigCallback cb) {
+ RcsProvisioningInfo info = mRcsProvisioningInfos.get(subId);
+ // should not happen in normal case
+ if (info == null) {
+ logd("fail to unregister rcs provisioning changed due to subscription unavailable");
+ return false;
+ }
+
+ return info.removeRcsConfigCallback(cb);
+ }
+
+ /**
* override the device config whether single registration is enabled
*/
public void overrideDeviceSingleRegistrationEnabled(Boolean enabled) {
@@ -291,7 +419,7 @@
* Overrides the carrier config whether single registration is enabled
*/
public boolean overrideCarrierSingleRegistrationEnabled(int subId, Boolean enabled) {
- if (!mSingleRegistrations.containsKey(subId)) {
+ if (!mRcsProvisioningInfos.containsKey(subId)) {
return false;
}
mHandler.sendMessage(mHandler.obtainMessage(
@@ -303,8 +431,9 @@
* Returns the device config whether single registration is enabled
*/
public boolean getDeviceSingleRegistrationEnabled() {
- for (int val : mSingleRegistrations.values()) {
- return (val & ProvisioningManager.STATUS_DEVICE_NOT_CAPABLE) == 0;
+ for (RcsProvisioningInfo info : mRcsProvisioningInfos.values()) {
+ return (info.getSingleRegistrationCapability()
+ & ProvisioningManager.STATUS_DEVICE_NOT_CAPABLE) == 0;
}
return false;
}
@@ -313,8 +442,8 @@
* Returns the carrier config whether single registration is enabled
*/
public boolean getCarrierSingleRegistrationEnabled(int subId) {
- if (mSingleRegistrations.containsKey(subId)) {
- return (mSingleRegistrations.get(subId)
+ if (mRcsProvisioningInfos.containsKey(subId)) {
+ return (mRcsProvisioningInfos.get(subId).getSingleRegistrationCapability()
& ProvisioningManager.STATUS_CARRIER_NOT_CAPABLE) == 0;
}
return false;
@@ -323,20 +452,21 @@
private void onDefaultMessagingApplicationChanged() {
final String packageName = getDmaPackageName();
if (!TextUtils.equals(mDmaPackageName, packageName)) {
- //clear old callbacks
- ImsManager.getInstance(mPhone, mPhone.getPhone().getPhoneId())
- .clearRcsProvisioningCallbacks();
mDmaPackageName = packageName;
logv("new default messaging application " + mDmaPackageName);
- mConfigs.forEach((k, v) -> {
+
+ mRcsProvisioningInfos.forEach((k, v) -> {
+ byte[] cachedConfig = v.getConfig();
+ //clear old callbacks
+ v.clear();
if (isAcsUsed(k)) {
logv("acs used, trigger to re-configure.");
- mConfigs.put(k, null);
notifyRcsAutoConfigurationRemoved(k);
triggerRcsReconfiguration(k);
} else {
+ v.setConfig(cachedConfig);
logv("acs not used, notify.");
- notifyRcsAutoConfigurationReceived(k, v, false);
+ notifyRcsAutoConfigurationReceived(k, v.getConfig(), false);
}
});
}
@@ -425,58 +555,68 @@
private void onCarrierConfigChange() {
logv("onCarrierConfigChange");
- mConfigs.forEach((subId, config) -> {
+ mRcsProvisioningInfos.forEach((subId, info) -> {
int value = getSingleRegistrationCapableValue(subId);
- if (value != mSingleRegistrations.get(subId)) {
- mSingleRegistrations.put(subId, value);
- notifyDmaForSub(subId);
+ if (value != info.getSingleRegistrationCapability()) {
+ info.setSingleRegistrationCapability(value);
+ notifyDmaForSub(subId, value);
}
});
}
private void onSubChanged() {
final int[] activeSubs = mSubscriptionManager.getActiveSubscriptionIdList();
- final HashSet<Integer> subsToBeDeactivated = new HashSet<>(mConfigs.keySet());
+ final HashSet<Integer> subsToBeDeactivated = new HashSet<>(mRcsProvisioningInfos.keySet());
for (int i : activeSubs) {
subsToBeDeactivated.remove(i);
- if (!mConfigs.containsKey(i)) {
+ if (!mRcsProvisioningInfos.containsKey(i)) {
byte[] data = RcsConfig.loadRcsConfigForSub(mPhone, i, false);
- logv("new config is created for sub : " + i);
- mConfigs.put(i, data);
+ int capability = getSingleRegistrationCapableValue(i);
+ logv("new info is created for sub : " + i + ", single registration capability :"
+ + capability + ", rcs config : " + data);
+ mRcsProvisioningInfos.put(i, new RcsProvisioningInfo(i, capability, data));
notifyRcsAutoConfigurationReceived(i, data, false);
- mSingleRegistrations.put(i, getSingleRegistrationCapableValue(i));
- notifyDmaForSub(i);
+ notifyDmaForSub(i, capability);
}
}
subsToBeDeactivated.forEach(i -> {
- mConfigs.remove(i);
+ RcsProvisioningInfo info = mRcsProvisioningInfos.remove(i);
notifyRcsAutoConfigurationRemoved(i);
+ if (info != null) {
+ info.clear();
+ }
});
}
private void onConfigReceived(int subId, byte[] config, boolean isCompressed) {
logv("onConfigReceived, subId:" + subId + ", config:"
+ config + ", isCompressed:" + isCompressed);
- mConfigs.put(subId, isCompressed ? RcsConfig.decompressGzip(config) : config);
+ RcsProvisioningInfo info = mRcsProvisioningInfos.get(subId);
+ if (info != null) {
+ info.setConfig(isCompressed ? RcsConfig.decompressGzip(config) : config);
+ }
RcsConfig.updateConfigForSub(mPhone, subId, config, isCompressed);
notifyRcsAutoConfigurationReceived(subId, config, isCompressed);
}
private void onReconfigRequest(int subId) {
logv("onReconfigRequest, subId:" + subId);
- mConfigs.put(subId, null);
+ RcsProvisioningInfo info = mRcsProvisioningInfos.get(subId);
+ if (info != null) {
+ info.setConfig(null);
+ }
notifyRcsAutoConfigurationRemoved(subId);
triggerRcsReconfiguration(subId);
}
- private void notifyDmaForSub(int subId) {
+ private void notifyDmaForSub(int subId, int capability) {
final Intent intent = new Intent(
ProvisioningManager.ACTION_RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE);
intent.setPackage(mDmaPackageName);
intent.putExtra(ProvisioningManager.EXTRA_SUBSCRIPTION_ID, subId);
- intent.putExtra(ProvisioningManager.EXTRA_STATUS, mSingleRegistrations.get(subId));
+ intent.putExtra(ProvisioningManager.EXTRA_STATUS, capability);
logv("notify " + intent);
mPhone.sendBroadcast(intent);
}
diff --git a/tests/src/com/android/phone/RcsProvisioningMonitorTest.java b/tests/src/com/android/phone/RcsProvisioningMonitorTest.java
index fb1e502..02d2f8a 100644
--- a/tests/src/com/android/phone/RcsProvisioningMonitorTest.java
+++ b/tests/src/com/android/phone/RcsProvisioningMonitorTest.java
@@ -53,6 +53,7 @@
import android.telephony.ims.ProvisioningManager;
import android.telephony.ims.RcsConfig;
import android.telephony.ims.aidl.IImsConfig;
+import android.telephony.ims.aidl.IRcsConfigCallback;
import android.telephony.ims.feature.ImsFeature;
import android.test.mock.MockContentProvider;
import android.test.mock.MockContentResolver;
@@ -90,7 +91,7 @@
+ "\t\t<GroupChatAuth>1</GroupChatAuth>\n"
+ "\t\t<ftAuth>1</ftAuth>\n"
+ "\t\t<standaloneMsgAuth>1</standaloneMsgAuth>\n"
- + "\t\t<geolocPushAuth>1<geolocPushAuth>\n"
+ + "\t\t<geolocPushAuth>1</geolocPushAuth>\n"
+ "\t\t<Ext>\n"
+ "\t\t\t<DataOff>\n"
+ "\t\t\t\t<rcsMessagingDataOff>1</rcsMessagingDataOff>\n"
@@ -135,6 +136,8 @@
private Resources mResources;
@Mock
private PhoneGlobals mPhone;
+ @Mock
+ private IRcsConfigCallback mCallback;
private Executor mExecutor = new Executor() {
@Override
@@ -433,7 +436,6 @@
verify(mIImsConfig, times(1)).triggerRcsReconfiguration();
}
-
@Test
@SmallTest
public void testIsRcsVolteSingleRegistrationEnabled() throws Exception {
@@ -463,6 +465,56 @@
assertFalse(mRcsProvisioningMonitor.isRcsVolteSingleRegistrationEnabled(FAKE_SUB_ID_BASE));
}
+ @Test
+ @SmallTest
+ public void testRegisterThenUnregisterCallback() throws Exception {
+ createMonitor(1);
+
+ boolean result = mRcsProvisioningMonitor.registerRcsProvisioningChangedCallback(
+ FAKE_SUB_ID_BASE, mCallback);
+
+ assertTrue(result);
+ verify(mIImsConfig, times(1)).addRcsConfigCallback(eq(mCallback));
+
+ result = mRcsProvisioningMonitor.unregisterRcsProvisioningChangedCallback(
+ FAKE_SUB_ID_BASE, mCallback);
+
+ assertTrue(result);
+ verify(mIImsConfig, times(1)).removeRcsConfigCallback(eq(mCallback));
+ verify(mCallback, times(1)).onRemoved();
+ }
+
+ @Test
+ @SmallTest
+ public void testCallbackRemovedWhenSubInfoChanged() throws Exception {
+ createMonitor(1);
+
+ boolean result = mRcsProvisioningMonitor.registerRcsProvisioningChangedCallback(
+ FAKE_SUB_ID_BASE, mCallback);
+ makeFakeActiveSubIds(0);
+ mExecutor.execute(() -> mSubChangedListener.onSubscriptionsChanged());
+ processAllMessages();
+
+ assertTrue(result);
+ verify(mIImsConfig, times(1)).removeRcsConfigCallback(eq(mCallback));
+ verify(mCallback, times(1)).onRemoved();
+ }
+
+ @Test
+ @SmallTest
+ public void testCallbackRemovedWhenDmaChanged() throws Exception {
+ createMonitor(1);
+
+ boolean result = mRcsProvisioningMonitor.registerRcsProvisioningChangedCallback(
+ FAKE_SUB_ID_BASE, mCallback);
+ updateDefaultMessageApplication(DEFAULT_MESSAGING_APP2);
+ processAllMessages();
+
+ assertTrue(result);
+ verify(mIImsConfig, times(1)).removeRcsConfigCallback(eq(mCallback));
+ verify(mCallback, times(1)).onRemoved();
+ }
+
private void createMonitor(int subCount) {
if (Looper.myLooper() == null) {
Looper.prepare();
