diff options
| author | 2023-10-02 19:45:37 +0000 | |
|---|---|---|
| committer | 2023-10-02 19:45:37 +0000 | |
| commit | 73af03b89fa0a11039cdc33a174d29871dbb8c4c (patch) | |
| tree | c90fbf4d95b87008ad98b9b87f8e0590a0fa6607 | |
| parent | c79c20337222d701c39f3ff6e39e1a7f7924b71e (diff) | |
| parent | b6416af56cf7be58c30a9124d3c209bd307a015f (diff) | |
Merge "Setup flags for Credential Manager" into main
| -rw-r--r-- | AconfigFlags.bp | 14 | ||||
| -rw-r--r-- | core/java/android/credentials/flags.aconfig | 8 |
2 files changed, 22 insertions, 0 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index b1f587e45a6d..ab20edc8ba6e 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -38,6 +38,7 @@ aconfig_srcjars = [ ":display_flags_lib{.generated_srcjars}", ":android.multiuser.flags-aconfig-java{.generated_srcjars}", ":android.app.flags-aconfig-java{.generated_srcjars}", + ":android.credentials.flags-aconfig-java{.generated_srcjars}", ] filegroup { @@ -355,3 +356,16 @@ java_aconfig_library { aconfig_declarations: "android.hardware.radio.flags-aconfig", defaults: ["framework-minus-apex-aconfig-java-defaults"], } + +// Credential Manager +aconfig_declarations { + name: "android.credentials.flags-aconfig", + package: "android.credentials.flags", + srcs: ["core/java/android/credentials/flags.aconfig"], +} + +java_aconfig_library { + name: "android.credentials.flags-aconfig-java", + aconfig_declarations: "android.credentials.flags-aconfig", + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} diff --git a/core/java/android/credentials/flags.aconfig b/core/java/android/credentials/flags.aconfig new file mode 100644 index 000000000000..0d0305b5b626 --- /dev/null +++ b/core/java/android/credentials/flags.aconfig @@ -0,0 +1,8 @@ +package: "android.credentials.flags" + +flag { + namespace: "credential_manager" + name: "settings_activity_enabled" + description: "Enable the Credential Manager Settings Activity APIs" + bug: "300014059" +}
\ No newline at end of file |