From 84e95c0fdddd222bfcffa3822213bc251bb13f8d Mon Sep 17 00:00:00 2001
From: mrulhania <mrulhania@google.com>
Date: Thu, 14 Sep 2023 08:37:15 -0700
Subject: [PATCH] Add device aware permissions api flag
Bug: 300458216
Bug: 274852670
Test: build
Change-Id: Icb061e0d4ce9b38fbaf7655a368be6d4497c88c2
---
AconfigFlags.bp | 14 ++++++++++++++
core/java/android/permission/flags.aconfig | 8 ++++++++
2 files changed, 22 insertions(+)
create mode 100644 core/java/android/permission/flags.aconfig
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index a5178cfaeec8..a720473d2167 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -35,6 +35,7 @@ java_defaults {
":android.widget.flags-aconfig-java{.generated_srcjars}",
":com.android.media.flags.bettertogether-aconfig-java{.generated_srcjars}",
":sdk_sandbox_flags_lib{.generated_srcjars}",
+ ":android.permission.flags-aconfig-java{.generated_srcjars}",
],
// Add aconfig-annotations-lib as a dependency for the optimization
libs: ["aconfig-annotations-lib"],
@@ -250,3 +251,16 @@ java_aconfig_library {
aconfig_declarations: "com.android.media.flags.bettertogether-aconfig",
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+
+// Permissions
+aconfig_declarations {
+ name: "android.permission.flags-aconfig",
+ package: "android.permission.flags",
+ srcs: ["core/java/android/permission/flags.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.permission.flags-aconfig-java",
+ aconfig_declarations: "android.permission.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
diff --git a/core/java/android/permission/flags.aconfig b/core/java/android/permission/flags.aconfig
new file mode 100644
index 000000000000..77be5d400853
--- /dev/null
+++ b/core/java/android/permission/flags.aconfig
@@ -0,0 +1,8 @@
+package: "android.permission.flags"
+
+flag {
+ name: "device_aware_permission_apis"
+ namespace: "permissions"
+ description: "enable device aware permission APIs"
+ bug: "274852670"
+}
--
GitLab