summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Reema Bajwa <reemabajwa@google.com> 2022-12-20 02:18:04 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-12-20 02:18:04 +0000
commitda6d88b83c1df906ebfb9657b88a9e3c2d8e409c (patch)
treead523a96da3bd9b71eacc2826f6514f19d4b31f8
parentcfbbaf0c1fd2e9c777e5804d766d210be3ac1b8a (diff)
parent531be0b74dffa4fac4dc6c5b02efd5177c72bbb6 (diff)
Merge "Add config definitions for a default hybrid service"
-rw-r--r--core/res/res/values/config.xml15
-rw-r--r--core/res/res/values/symbols.xml1
2 files changed, 15 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index f995a6eeb5a3..fb10d3d464ee 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -4240,9 +4240,22 @@
If no service with the specified name exists on the device, on device search wil be
disabled.
Example: "com.android.intelliegence/.SearchUiService"
--->
+ -->
<string name="config_defaultSearchUiService" translatable="false"></string>
+ <!-- The component name, flattened to a string, for the system's credential manager
+ hybrid service. This service allows credential retrieval and storage from, and to
+ remote devices.
+
+ This service must be trusted, as it can be activated without explicit consent of the user.
+ If no service with the specified name exists on the device, credential manager
+ will still work, but remote credential retrieval and storage will not be offered to
+ the user.
+
+ See android.credentials.CredentialManager
+ -->
+ <string name="config_defaultCredentialManagerHybridService" translatable="false"></string>
+
<!-- The package name for the system's smartspace service.
This service returns smartspace results.
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 6d393f697e20..6fa553405690 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3688,6 +3688,7 @@
<java-symbol type="string" name="config_defaultTranslationService" />
<java-symbol type="string" name="config_defaultAppPredictionService" />
<java-symbol type="string" name="config_defaultContentSuggestionsService" />
+ <java-symbol type="string" name="config_defaultCredentialManagerHybridService" />
<java-symbol type="string" name="config_defaultSearchUiService" />
<java-symbol type="string" name="config_defaultSmartspaceService" />
<java-symbol type="string" name="config_defaultWallpaperEffectsGenerationService" />