summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Becca Hughes <beccahughes@google.com> 2023-09-26 15:10:08 -0700
committer Becca Hughes <beccahughes@google.com> 2023-09-26 15:12:18 -0700
commitb6416af56cf7be58c30a9124d3c209bd307a015f (patch)
treeb6fefc777b6d15734166da21e07330d0ec9db29b
parentb4339e42bb8454f14285084186fdfcd01ee99afd (diff)
Setup flags for Credential Manager
And add first settings activity flag. Test: make Bug: 300014059 Change-Id: Ie564e8dfa11b0cb9072eb40b77f5c399a5262e19
-rw-r--r--AconfigFlags.bp14
-rw-r--r--core/java/android/credentials/flags.aconfig8
2 files changed, 22 insertions, 0 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 08a09e1b1a73..be747eff2a00 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