diff options
| author | Brad Ebinger <breadley@google.com> | 2019-12-05 11:36:43 -0800 |
|---|---|---|
| committer | Brad Ebinger <breadley@google.com> | 2019-12-18 11:06:29 -0800 |
| commit | 2fe888c5e320c883d239a8f184db9c5a2e5251e4 (patch) | |
| tree | c8d4c735cfdae92e8e16f8744d7794365639a3eb | |
| parent | 9e9e3f4fd375441bcc303ce43ddec3baf8b1f43e (diff) | |
| download | bonito-2fe888c5e320c883d239a8f184db9c5a2e5251e4.tar.gz | |
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; manual test
Merged-In: I13dcbeae456bd26e4782f768e9c30a299e2d9d71
Change-Id: I13dcbeae456bd26e4782f768e9c30a299e2d9d71
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 6 | ||||
| -rw-r--r-- | overlay/packages/services/Telephony/res/values/config.xml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index bef2559c..be9c87fb 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -231,12 +231,6 @@ <!-- Whether the display blanks itself when transition from a doze to a non-doze state --> <bool name="config_displayBlanksAfterDoze">true</bool> - <!-- ImsService package name to bind to by default, if config_dynamic_bind_ims is true --> - <string name="config_ims_package" translatable="false">org.codeaurora.ims</string> - - <!-- Flag specifying whether or not IMS will use the ImsResolver dynamically --> - <bool name="config_dynamic_bind_ims">true</bool> - <!-- Specifies whether to decouple the auto-suspend state of the device from the display on/off state. --> <bool name="config_powerDecoupleAutoSuspendModeFromDisplay">true</bool> diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml index f9a7c262..fde52c23 100644 --- a/overlay/packages/services/Telephony/res/values/config.xml +++ b/overlay/packages/services/Telephony/res/values/config.xml @@ -23,6 +23,12 @@ <!-- Flag indicating whether the device supports RTT (real-time text) --> <bool name="config_support_rtt">true</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> + <!-- This device supports the AudioManager Telephony audio device and output onto this device using {@link AudioDeviceInfo#TYPE_TELEPHONY}. This is used to support carriers which generate a recording tone to the remote party |