Remove OEM config for sim call manager [Telecom part]
This is the telecom part of deleting the OEM config.
See ag/710820 for the overlay part.
We can now set the default sim call manager using the following carrier config:
CarrierConfigManager.KEY_DEFAULT_SIM_CALL_MANAGER_STRING
This CL removes the old OEM config value.
BUG: 21499566
Change-Id: Ib287fa6d2c80b950fa1cb65e98c470fd7290c95c
diff --git a/res/values/config.xml b/res/values/config.xml
index 6c6f215..365e758 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -38,9 +38,4 @@
<!-- Flag indicating if the tty is enabled -->
<bool name="tty_enabled">false</bool>
-
- <!-- ComponentName for the default connection manager component. If this cannot be resolved, or
- if this package has not registered any accounts, then it will be ignored.
- [DO NOT TRANSLATE] -->
- <string name="default_connection_manager_component" translatable="false"></string>
</resources>
diff --git a/src/com/android/server/telecom/PhoneAccountRegistrar.java b/src/com/android/server/telecom/PhoneAccountRegistrar.java
index aa17b14..f2e97bb 100644
--- a/src/com/android/server/telecom/PhoneAccountRegistrar.java
+++ b/src/com/android/server/telecom/PhoneAccountRegistrar.java
@@ -312,12 +312,6 @@
CarrierConfigManager.KEY_DEFAULT_SIM_CALL_MANAGER_STRING);
}
- // Check OEM config. TODO: Remove this once the carrier config value is set.
- if (TextUtils.isEmpty(defaultSimCallManager)) {
- defaultSimCallManager = mContext.getResources().getString(
- R.string.default_connection_manager_component);
- }
-
if (!TextUtils.isEmpty(defaultSimCallManager)) {
ComponentName componentName = ComponentName.unflattenFromString(defaultSimCallManager);
if (componentName == null) {