From bfa61b4de5d969c5b9624e859c808768f0237b03 Mon Sep 17 00:00:00 2001
From: Brad Ebinger <breadley@google.com>
Date: Thu, 5 Dec 2019 11:37:45 -0800
Subject: msm8996-common: overlay: Remove old configuration and use new config
 for MMTEL/RCS

Remove the old config_ims_package device config and configure the
new MMTEL and RCS configurations in Telephony instead. Also,
configure the RcsService to be the default RCS service.

Bug: 111305845
Test: make checkbuild
Change-Id: I0d709b8248f1c40f0a5b50ec799396706eeadd65
---
 overlay/frameworks/base/core/res/res/values/config.xml    | 6 ------
 overlay/packages/services/Telephony/res/values/config.xml | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'overlay')

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 1880956..478c989 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -433,12 +433,6 @@
          provisioning, availability etc -->
     <bool name="config_carrier_wfc_ims_available">true</bool>
 
-    <!-- ImsService package name to bind to by default, if config_dynamic_bind_ims is true -->
-    <string name="config_ims_package">org.codeaurora.ims</string>
-
-    <!-- Flag specifying whether or not IMS will use the ImsResolver dynamically -->
-    <bool name="config_dynamic_bind_ims">true</bool>
-
     <!-- Config determines whether to update phone object when voice registration
          state changes. Voice radio tech change will always trigger an update of
          phone object irrespective of this config -->
diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml
index fae2b34..9e5b9d7 100644
--- a/overlay/packages/services/Telephony/res/values/config.xml
+++ b/overlay/packages/services/Telephony/res/values/config.xml
@@ -46,4 +46,10 @@
 
     <!-- Allows the telephony HFA logic to run even if we're not in setup wizard. -->
     <bool name="config_allow_hfa_outside_of_setup_wizard">false</bool>
+
+    <!-- String indicating the package name of the device ImsService implementation for MMTEL. -->
+    <string name="config_ims_mmtel_package">org.codeaurora.ims</string>
+
+    <!-- String indicating the package name of the device ImsService implementation for RCS. -->
+    <string name="config_ims_rcs_package">com.android.service.ims</string>
 </resources>
-- 
cgit v1.2.3