From 8a1a40d02c6bca39ed81d131a859e031b8e6d81b Mon Sep 17 00:00:00 2001
From: Eugene Susla <eugenesusla@google.com>
Date: Mon, 12 Apr 2021 09:28:26 -0700
Subject: [PATCH] Rename CDM provider config property

Also make it public for to be consistent with others

Test: ensure GMS gets teh CDM provider role
Bug: 181344542
Change-Id: I6cf1cebf1e4f225a88f6591cea449d15c85760b8
---
 core/api/system-current.txt     | 1 +
 core/res/res/values/config.xml  | 9 ++-------
 core/res/res/values/public.xml  | 2 ++
 core/res/res/values/symbols.xml | 1 -
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index bd36d2c6ca8ea..9d7b7b0e9111c 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -371,6 +371,7 @@ package android {
     field public static final int config_systemAudioIntelligence;
     field public static final int config_systemAutomotiveCluster;
     field public static final int config_systemAutomotiveProjection;
+    field public static final int config_systemCompanionDeviceProvider;
     field public static final int config_systemContacts;
     field public static final int config_systemGallery = 17039399; // 0x1040027
     field public static final int config_systemNotificationIntelligence;
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 864db5ee7eb2e..12fba372e90f3 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3714,13 +3714,6 @@
      -->
     <string name="config_defaultWellbeingPackage" translatable="false"></string>
 
-    <!-- The package name for the companion provider app.
-         This package must be trusted, as it has the permissions to associate apps with devices
-         without a UI prompt.
-         Example: "com.google.android.gms"
-     -->
-    <string name="config_companionProviderPackage" translatable="false"></string>
-
     <!-- The component name for the default system attention service.
          This service must be trusted, as it can be activated without explicit consent of the user.
          See android.attention.AttentionManagerService.
@@ -4854,4 +4847,6 @@
     <string name="config_systemTextIntelligence" translatable="false"></string>
     <!-- On-device intelligent processor for visual features. -->
     <string name="config_systemVisualIntelligence" translatable="false"></string>
+    <!-- On-device package for providing companion device associations. -->
+    <string name="config_systemCompanionDeviceProvider" translatable="false"></string>
 </resources>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 89adc8ca69133..f6a67d2ae7105 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -3225,6 +3225,8 @@
     <public name="config_systemVisualIntelligence" />
     <!-- @hide @SystemApi -->
     <public name="config_systemActivityRecognizer" />
+    <!-- @hide @SystemApi -->
+    <public name="config_systemCompanionDeviceProvider"/>
   </staging-public-group>
 
   <staging-public-group type="id" first-id="0x01020055">
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index ff4c123291f30..dce0eea158228 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3536,7 +3536,6 @@
   <java-symbol type="string" name="notification_channel_do_not_disturb" />
   <java-symbol type="string" name="notification_channel_accessibility_magnification" />
   <java-symbol type="string" name="notification_channel_accessibility_security_policy" />
-  <java-symbol type="string" name="config_companionProviderPackage" />
   <java-symbol type="string" name="config_defaultAutofillService" />
   <java-symbol type="string" name="config_defaultOnDeviceSpeechRecognitionService" />
   <java-symbol type="string" name="config_defaultTextClassifierPackage" />