diff options
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 9 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 2 | ||||
| -rw-r--r-- | 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 c0ac7f1759bc..ce408d1a80f1 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 e4ea8fb284a8..906a7403298f 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3721,13 +3721,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. @@ -4861,4 +4854,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 89adc8ca6913..f6a67d2ae710 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 4bb323661d33..3de2ac108021 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3537,7 +3537,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" /> |