summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jerry Shi <sgjerry@google.com> 2023-04-30 16:27:41 -0700
committer Guangjie (Jerry) Shi <sgjerry@google.com> 2023-05-02 23:13:38 +0000
commitc41153427cd017a2d9eb0e3441a452386e4c08cd (patch)
treef5731b1d33a82e9beadf5f48cf35b5033527dae0
parentdb1fc4557c3f4616e7a074cc9d899c1332952a30 (diff)
Add new setting key for credential manager default provider
Test: built locally Bug: 280492574 Change-Id: I312fe2c5eda38b3b669799165ed64f41a5394747
-rw-r--r--core/java/android/provider/Settings.java7
-rw-r--r--packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java3
2 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 4a46beb670de..329a2fa57c08 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7175,6 +7175,13 @@ public final class Settings {
public static final String CREDENTIAL_SERVICE = "credential_service";
/**
+ * The currently selected primary credential service flattened ComponentName.
+ *
+ * @hide
+ */
+ public static final String CREDENTIAL_SERVICE_PRIMARY = "credential_service_primary";
+
+ /**
* The currently selected autofill service flattened ComponentName.
* @hide
*/
diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
index 706666cbebab..2e49dd5eeba9 100644
--- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
+++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
@@ -841,7 +841,8 @@ public class SettingsBackupTest {
Settings.Secure.ACCESSIBILITY_SHOW_WINDOW_MAGNIFICATION_PROMPT,
Settings.Secure.ACCESSIBILITY_FLOATING_MENU_MIGRATION_TOOLTIP_PROMPT,
Settings.Secure.UI_TRANSLATION_ENABLED,
- Settings.Secure.CREDENTIAL_SERVICE);
+ Settings.Secure.CREDENTIAL_SERVICE,
+ Settings.Secure.CREDENTIAL_SERVICE_PRIMARY);
@Test
public void systemSettingsBackedUpOrDenied() {