Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeeca92e authored May 03, 2023 by TreeHugger Robot Committed by Automerger Merge Worker May 03, 2023

Merge "Add new setting key for credential manager default provider" into udc-dev am: 8bf55aeb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22951171

Change-Id: I8397a69127aa3dbcee0e8e1ed4b48f602cf825b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents ebcc22f2 8bf55aeb

core/java/android/provider/Settings.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -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

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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() {