From 398dc0786ab68bc029ba568100e5145ab3444553 Mon Sep 17 00:00:00 2001
From: Hunsuk Choi <forestchoi@google.com>
Date: Tue, 9 Jan 2024 03:44:41 +0000
Subject: [PATCH] Fix domain selection service configuration for plug-in
 architecture

Bug: 258112541
Test: build
Change-Id: Ia2531e9ab165a9c3b87cc2fc2e06428d99dc9ffa
---
 .../packages/services/Telephony/res/values/config.xml      | 7 ++++---
 .../packages/services/Telephony/res/values/config.xml      | 7 ++++---
 .../packages/services/Telephony/res/values/config.xml      | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/caiman/overlay/packages/services/Telephony/res/values/config.xml b/caiman/overlay/packages/services/Telephony/res/values/config.xml
index bbe80c05..5f0d3a5f 100644
--- a/caiman/overlay/packages/services/Telephony/res/values/config.xml
+++ b/caiman/overlay/packages/services/Telephony/res/values/config.xml
@@ -17,7 +17,8 @@
 <!-- Phone app resources that may need to be customized
      for different hardware or product builds. -->
 <resources>
-    <!-- Flag specifying whether the AOSP domain selection is enabled or
-         the device should fallback to the modem based domain selection architecture. -->
-    <bool name="config_enable_aosp_domain_selection">true</bool>
+    <!-- The component name(a flattened ComponentName string) for the telephony domain selection
+         service. The device should fallback to the modem based domain selection architecture
+         if this is not configured. -->
+    <string name="config_domain_selection_service_component_name" translatable="false">com.android.phone/com.android.services.telephony.domainselection.TelephonyDomainSelectionService</string>
 </resources>
diff --git a/komodo/overlay/packages/services/Telephony/res/values/config.xml b/komodo/overlay/packages/services/Telephony/res/values/config.xml
index bbe80c05..5f0d3a5f 100644
--- a/komodo/overlay/packages/services/Telephony/res/values/config.xml
+++ b/komodo/overlay/packages/services/Telephony/res/values/config.xml
@@ -17,7 +17,8 @@
 <!-- Phone app resources that may need to be customized
      for different hardware or product builds. -->
 <resources>
-    <!-- Flag specifying whether the AOSP domain selection is enabled or
-         the device should fallback to the modem based domain selection architecture. -->
-    <bool name="config_enable_aosp_domain_selection">true</bool>
+    <!-- The component name(a flattened ComponentName string) for the telephony domain selection
+         service. The device should fallback to the modem based domain selection architecture
+         if this is not configured. -->
+    <string name="config_domain_selection_service_component_name" translatable="false">com.android.phone/com.android.services.telephony.domainselection.TelephonyDomainSelectionService</string>
 </resources>
diff --git a/tokay/overlay/packages/services/Telephony/res/values/config.xml b/tokay/overlay/packages/services/Telephony/res/values/config.xml
index bbe80c05..5f0d3a5f 100644
--- a/tokay/overlay/packages/services/Telephony/res/values/config.xml
+++ b/tokay/overlay/packages/services/Telephony/res/values/config.xml
@@ -17,7 +17,8 @@
 <!-- Phone app resources that may need to be customized
      for different hardware or product builds. -->
 <resources>
-    <!-- Flag specifying whether the AOSP domain selection is enabled or
-         the device should fallback to the modem based domain selection architecture. -->
-    <bool name="config_enable_aosp_domain_selection">true</bool>
+    <!-- The component name(a flattened ComponentName string) for the telephony domain selection
+         service. The device should fallback to the modem based domain selection architecture
+         if this is not configured. -->
+    <string name="config_domain_selection_service_component_name" translatable="false">com.android.phone/com.android.services.telephony.domainselection.TelephonyDomainSelectionService</string>
 </resources>