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

Commit ec7c38d4 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...

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

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

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

parents 65a5c603 f9b7ee9d

core/java/android/provider/Settings.java

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7203,6 +7203,13 @@ public final class Settings {
	*/		*/
	public static final String CREDENTIAL_SERVICE = "credential_service";		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.		* The currently selected autofill service flattened ComponentName.
	* @hide		* @hide

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -842,7 +842,8 @@ public class SettingsBackupTest {
	Settings.Secure.ACCESSIBILITY_SHOW_WINDOW_MAGNIFICATION_PROMPT,		Settings.Secure.ACCESSIBILITY_SHOW_WINDOW_MAGNIFICATION_PROMPT,
	Settings.Secure.ACCESSIBILITY_FLOATING_MENU_MIGRATION_TOOLTIP_PROMPT,		Settings.Secure.ACCESSIBILITY_FLOATING_MENU_MIGRATION_TOOLTIP_PROMPT,
	Settings.Secure.UI_TRANSLATION_ENABLED,		Settings.Secure.UI_TRANSLATION_ENABLED,
	Settings.Secure.CREDENTIAL_SERVICE);		Settings.Secure.CREDENTIAL_SERVICE,
			Settings.Secure.CREDENTIAL_SERVICE_PRIMARY);

	@Test		@Test
	public void systemSettingsBackedUpOrDenied() {		public void systemSettingsBackedUpOrDenied() {