From 21163f4e36951671ec236a9e888f9bd8b4fdddf1 Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Thu, 7 Nov 2019 13:44:26 -0800
Subject: [PATCH] Add config for default holders of call redirection and call
 screening.

Test: presubmit
Fixes: 144105784
Change-Id: I581cfa45dd6263593c390556cf49d55c8281daed
---
 api/system-current.txt         | 2 ++
 core/res/res/values/config.xml | 4 ++++
 core/res/res/values/public.xml | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/api/system-current.txt b/api/system-current.txt
index 5d3ecf50bde51..f0bc57abff044 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -261,6 +261,8 @@ package android {
   public static final class R.string {
     field public static final int config_defaultAssistant = 17039393; // 0x1040021
     field public static final int config_defaultBrowser = 17039394; // 0x1040022
+    field public static final int config_defaultCallRedirection = 17039400; // 0x1040028
+    field public static final int config_defaultCallScreening = 17039401; // 0x1040029
     field public static final int config_defaultDialer = 17039395; // 0x1040023
     field public static final int config_defaultSms = 17039396; // 0x1040024
     field public static final int config_feedbackIntentExtraKey = 17039391; // 0x104001f
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index b5e14d6981c2a..4eb14193b2f1b 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1865,6 +1865,10 @@
     <bool name="config_showDefaultEmergency">false</bool>
     <!-- Whether the default home settings should be shown. -->
     <bool name="config_showDefaultHome">true</bool>
+    <!-- The name of the package that will hold the call redirection role by default. -->
+    <string name="config_defaultCallRedirection" translatable="false"></string>
+    <!-- The name of the package that will hold the call screening role by default. -->
+    <string name="config_defaultCallScreening" translatable="false"></string>
 
     <!-- Enable/disable default bluetooth profiles:
         HSP_AG, ObexObjectPush, Audio, NAP -->
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 9b89eab05bd18..3e57daed4c5fc 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -3022,6 +3022,10 @@
       <public name="notification_channel_network_alerts" />
       <!-- @hide @SystemApi -->
       <public name="notification_channel_network_available" />
+      <!-- @hide @SystemApi -->
+      <public name="config_defaultCallRedirection" />
+      <!-- @hide @SystemApi -->
+      <public name="config_defaultCallScreening" />
     </public-group>
 
     <public-group type="bool" first-id="0x01110005">