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 am: 8bf55aeb09

Browse Source 
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>
This commit is contained in:
TreeHugger Robot
2023-05-03 01:17:44 +00:00
committed by Automerger Merge Worker
parent ebcc22f271 8bf55aeb09
commit eeeca92ea2
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";
/**
* 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

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_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() {