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

Commit 8bf55aeb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 8e4a7e8b c4115342

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