IMS: Fix carrier config read error in multi sim
Get the right carrier config value by using
isCarrierConfigEnabled function in QtiImsExtUtils.
Change-Id: Icc4252e2fc04457451faa6b75f1985fd0c9d9070
CRs-Fixed: 2021193
diff --git a/InCallUI/res/values-mcc460-mnc00/qticonfig.xml b/InCallUI/res/values-mcc460-mnc00/qticonfig.xml
index de8962c..a900f36 100644
--- a/InCallUI/res/values-mcc460-mnc00/qticonfig.xml
+++ b/InCallUI/res/values-mcc460-mnc00/qticonfig.xml
@@ -37,6 +37,4 @@
<bool name="config_conference_call_show_participant_status">true</bool>
<!-- Config to enable/disable add multi participants -->
<bool name="add_multi_participants_enabled">true</bool>
- <!-- Config to add participant only in conferencall call-->
- <bool name="add_participant_only_in_conference">true</bool>
</resources>
diff --git a/InCallUI/res/values-mcc460-mnc02/qticonfig.xml b/InCallUI/res/values-mcc460-mnc02/qticonfig.xml
index 9613155..ca0cf90 100644
--- a/InCallUI/res/values-mcc460-mnc02/qticonfig.xml
+++ b/InCallUI/res/values-mcc460-mnc02/qticonfig.xml
@@ -37,6 +37,4 @@
<bool name="config_conference_call_show_participant_status">true</bool>
<!-- Config to enable/disable add multi participants -->
<bool name="add_multi_participants_enabled">true</bool>
- <!-- Config to add participant only in conferencall call-->
- <bool name="add_participant_only_in_conference">true</bool>
</resources>
diff --git a/InCallUI/res/values-mcc460-mnc07/qticonfig.xml b/InCallUI/res/values-mcc460-mnc07/qticonfig.xml
index de8962c..a900f36 100644
--- a/InCallUI/res/values-mcc460-mnc07/qticonfig.xml
+++ b/InCallUI/res/values-mcc460-mnc07/qticonfig.xml
@@ -37,6 +37,4 @@
<bool name="config_conference_call_show_participant_status">true</bool>
<!-- Config to enable/disable add multi participants -->
<bool name="add_multi_participants_enabled">true</bool>
- <!-- Config to add participant only in conferencall call-->
- <bool name="add_participant_only_in_conference">true</bool>
</resources>
diff --git a/InCallUI/res/values-mcc460-mnc08/qticonfig.xml b/InCallUI/res/values-mcc460-mnc08/qticonfig.xml
index de8962c..a900f36 100644
--- a/InCallUI/res/values-mcc460-mnc08/qticonfig.xml
+++ b/InCallUI/res/values-mcc460-mnc08/qticonfig.xml
@@ -37,6 +37,4 @@
<bool name="config_conference_call_show_participant_status">true</bool>
<!-- Config to enable/disable add multi participants -->
<bool name="add_multi_participants_enabled">true</bool>
- <!-- Config to add participant only in conferencall call-->
- <bool name="add_participant_only_in_conference">true</bool>
</resources>
diff --git a/InCallUI/res/values/qticonfig.xml b/InCallUI/res/values/qticonfig.xml
index 41c6298..61126a9 100644
--- a/InCallUI/res/values/qticonfig.xml
+++ b/InCallUI/res/values/qticonfig.xml
@@ -42,8 +42,6 @@
<bool name="config_conference_call_show_participant_status">false</bool>
<!-- Config to enable/disable add multi participants -->
<bool name="add_multi_participants_enabled">false</bool>
- <!-- Config to add participant only in conferencall call-->
- <bool name="add_participant_only_in_conference">false</bool>
<!-- Config to if show preview before the receiver accepts a show me upgrade video call -->
<bool name="config_enable_modify_call_preview">false</bool>
<!-- Config to show/hide HD Icon2 -->
diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
index 91a8e0b..13e787a 100644
--- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
@@ -538,8 +538,8 @@
final boolean showMute = call.can(android.telecom.Call.Details.CAPABILITY_MUTE);
int callTransferCapabilities = call.isEmergencyCall()? 0 : call.getTransferCapabilities();
boolean showAddParticipant = call.can(CAPABILITY_ADD_PARTICIPANT);
- if (ui.getContext().getResources().getBoolean(
- R.bool.add_participant_only_in_conference)) {
+ if (QtiImsExtUtils.isCarrierConfigEnabled(getUi().getContext(),
+ "add_participant_only_in_conference")) {
showAddParticipant = showAddParticipant&&(call.isConferenceCall());
}