commit 1b51b7533bb7d63145a63b8af5e8de08579a8127
author Alex Johnston <acjohnston@google.com> Mon Dec 02 18:40:24 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 02 18:40:24 2024 +0000
tree 05314a0ec5a42f6770b02d35b418988e4099484a
parent b7da058a26dcf9ee80e705d8c5054b20511ebcf7
parent 9505d8b653a837e897a8751a515b504068618b3c

Merge "Allow admin flags to be used in PermissionController" into main

AconfigFlags.bp

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 3c2ae5a..371177c 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -1220,6 +1220,17 @@
 }
 
 java_aconfig_library {
+    name: "device_policy_aconfig_flags_java_export",
+    aconfig_declarations: "device_policy_aconfig_flags",
+    defaults: ["framework-minus-apex-aconfig-java-defaults"],
+    min_sdk_version: "30",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.permission",
+    ],
+}
+
+java_aconfig_library {
     name: "device_policy_aconfig_flags_lib_host",
     aconfig_declarations: "device_policy_aconfig_flags",
     host_supported: true,

core/java/android/app/admin/flags/flags.aconfig

diff --git a/core/java/android/app/admin/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig
index 22bc356..361ba73 100644
--- a/core/java/android/app/admin/flags/flags.aconfig
+++ b/core/java/android/app/admin/flags/flags.aconfig
@@ -398,6 +398,7 @@
 
 flag {
   name: "split_create_managed_profile_enabled"
+  is_exported: true
   namespace: "enterprise"
   description: "Split up existing create and provision managed profile API."
   bug: "375382324"