Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new setting key for credential manager default provider" into udc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-05-03 00:57:31 +00:00
committed by Android (Google) Code Review
parent 8e4a7e8b84 c41153427c
commit 8bf55aeb09
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/provider/Settings.java
View File

@@ -7174,6 +7174,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

3
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -841,7 +841,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() {