From c41153427cd017a2d9eb0e3441a452386e4c08cd Mon Sep 17 00:00:00 2001 From: Jerry Shi Date: Sun, 30 Apr 2023 16:27:41 -0700 Subject: [PATCH] Add new setting key for credential manager default provider Test: built locally Bug: 280492574 Change-Id: I312fe2c5eda38b3b669799165ed64f41a5394747 --- core/java/android/provider/Settings.java | 7 +++++++ .../test/src/android/provider/SettingsBackupTest.java | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 4a46beb670de8..329a2fa57c08d 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7174,6 +7174,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 706666cbebabf..2e49dd5eeba9f 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() {