Migrate permission flags for Permission to be exported flags

LOW_COVERAGE_REASON=NON_CODE_ONLY
Bug: 336313566
Test: All existing automation tests
Change-Id: If7d6e21eea10d7aa638a3965af84f25bc91f9e19

16 files changed, 46 insertions, 27 deletions

diff --git a/PermissionController/Android.bp b/PermissionController/Android.bp
index 9710a06d8..a8d2f846f 100644
--- a/PermissionController/Android.bp
+++ b/PermissionController/Android.bp
@@ -147,8 +147,8 @@ android_library {
         "lottie",
         "safety-label",
         "role-controller",
-        "permissions-aconfig-flags-lib",
-        "android.permission.flags-aconfig-java",
+        "android.permission.flags-aconfig-java-export",
+        "com.android.permission.flags-aconfig-java-export",
         "androidx.compose.foundation_foundation",
         "androidx.compose.runtime_runtime",
         "androidx.compose.runtime_runtime-livedata",
diff --git a/PermissionController/role-controller/Android.bp b/PermissionController/role-controller/Android.bp
index 437d7ca5e..90afffedf 100644
--- a/PermissionController/role-controller/Android.bp
+++ b/PermissionController/role-controller/Android.bp
@@ -27,7 +27,7 @@ java_library {
     ],
     static_libs: [
         "modules-utils-build_system",
-        "android.permission.flags-aconfig-java",
+        "android.permission.flags-aconfig-java-export",
     ],
     apex_available: [
         "com.android.permission",
diff --git a/PermissionController/tests/mocking/Android.bp b/PermissionController/tests/mocking/Android.bp
index 2375a74e6..3d425f5f8 100644
--- a/PermissionController/tests/mocking/Android.bp
+++ b/PermissionController/tests/mocking/Android.bp
@@ -117,11 +117,10 @@ android_test {
         "safety-label",
         "role-controller",
         "lottie",
-        "permissions-aconfig-flags-lib",
-        "android.permission.flags-aconfig-java",
+        "android.permission.flags-aconfig-java-export",
+        "com.android.permission.flags-aconfig-java-export",
         "platform-test-annotations",
         "flag-junit",
-
         "androidx.test.rules",
         "androidx.test.ext.truth",
         "androidx.test.ext.junit",
diff --git a/SafetyCenter/Config/Android.bp b/SafetyCenter/Config/Android.bp
index 48c8eab46..a8d275226 100644
--- a/SafetyCenter/Config/Android.bp
+++ b/SafetyCenter/Config/Android.bp
@@ -40,7 +40,7 @@ java_library {
     ],
     static_libs: [
         "modules-utils-build",
-        "permissions-aconfig-flags-lib",
+        "com.android.permission.flags-aconfig-java",
     ],
     apex_available: [
         "com.android.permission",
diff --git a/SafetyCenter/Config/tests/Android.bp b/SafetyCenter/Config/tests/Android.bp
index 20a536237..f80dec61e 100644
--- a/SafetyCenter/Config/tests/Android.bp
+++ b/SafetyCenter/Config/tests/Android.bp
@@ -33,7 +33,7 @@ android_test {
         "compatibility-device-util-axt",
         "safety-center-config",
         "safety-center-test-util-lib",
-        "permissions-aconfig-flags-lib",
+        "com.android.permission.flags-aconfig-java",
     ],
     test_suites: [
         "general-tests",
diff --git a/flags/Android.bp b/flags/Android.bp
index bd711fb16..457aa4f91 100644
--- a/flags/Android.bp
+++ b/flags/Android.bp
@@ -19,24 +19,42 @@ package {
 }
 
 aconfig_declarations {
-    name: "permissions-aconfig-flags",
-    package: "com.android.permission.flags",
+    name: "com.android.permission.flags-aconfig",
     container: "com.android.permission",
+    package: "com.android.permission.flags",
+    exportable: true,
     srcs: ["flags.aconfig"],
 }
 
 java_aconfig_library {
-    name: "permissions-aconfig-flags-lib",
-    aconfig_declarations: "permissions-aconfig-flags",
+    name: "com.android.permission.flags-aconfig-java-export",
+    aconfig_declarations: "com.android.permission.flags-aconfig",
+    mode: "exported",
     sdk_version: "module_current",
     min_sdk_version: "30",
+    installable: false,
+    libs: ["framework-configinfrastructure"],
+    visibility: [
+        "//packages/modules/Permission:__subpackages__",
+    ],
     apex_available: [
         "com.android.permission",
         "test_com.android.permission",
     ],
+}
+
+java_aconfig_library {
+    name: "com.android.permission.flags-aconfig-java",
+    aconfig_declarations: "com.android.permission.flags-aconfig",
+    sdk_version: "module_current",
+    min_sdk_version: "30",
     installable: false,
     libs: ["framework-configinfrastructure"],
     visibility: [
         "//packages/modules/Permission:__subpackages__",
     ],
+    apex_available: [
+        "com.android.permission",
+        "test_com.android.permission",
+    ],
 }
diff --git a/flags/flags.aconfig b/flags/flags.aconfig
index 7ffabd45d..a81de8144 100644
--- a/flags/flags.aconfig
+++ b/flags/flags.aconfig
@@ -3,6 +3,7 @@ container: "com.android.permission"
 
 flag {
     name: "private_profile_supported"
+    is_exported: true
     namespace: "permissions"
     description: "This flag is used to support private profile in safety center"
     bug: "286539356"
@@ -20,6 +21,7 @@ flag {
 
 flag {
     name: "wear_privacy_dashboard_enabled_read_only"
+    is_exported: true
     namespace: "wear_security"
     description: "This flag is used to support Privacy dashboard for Wear"
     bug: "309721061"
@@ -28,6 +30,7 @@ flag {
 
 flag {
     name: "archiving_read_only"
+    is_exported: true
     namespace: "permissions"
     description: "Feature flag to enable the archiving feature."
     bug: "278553670"
@@ -36,6 +39,7 @@ flag {
 
 flag {
     name: "add_banners_to_privacy_sensitive_apps_for_aaos"
+    is_exported: true
     namespace: "permissions"
     description: "Flag to display warning banners to privacy sensitive apps in AAOS."
     bug: "327489942"
diff --git a/framework-s/Android.bp b/framework-s/Android.bp
index 54a760e22..547beb3f8 100644
--- a/framework-s/Android.bp
+++ b/framework-s/Android.bp
@@ -80,8 +80,8 @@ java_sdk_library {
     static_libs: [
         "framework-permission-s-shared",
         "modules-utils-build",
-        "android.permission.flags-aconfig-java",
-        "permissions-aconfig-flags-lib",
+        "android.permission.flags-aconfig-java-export",
+        "com.android.permission.flags-aconfig-java",
     ],
     apex_available: [
         "com.android.permission",
@@ -105,6 +105,6 @@ java_sdk_library {
     ],
     aconfig_declarations: [
         "android.permission.flags-aconfig",
-        "permissions-aconfig-flags",
+        "com.android.permission.flags-aconfig",
     ],
 }
diff --git a/service/Android.bp b/service/Android.bp
index 712aed793..d80fa4f0d 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -111,8 +111,7 @@ java_sdk_library {
         "service-permission-statsd",
         "permissioncontroller-statsd",
         "service-permission-proto-stream",
-        "android.permission.flags-aconfig-java",
-        "permissions-aconfig-flags-lib",
+        "com.android.permission.flags-aconfig-java",
     ],
     errorprone: {
         javacflags: ["-Xep:GuardedBy:ERROR"],
@@ -148,7 +147,8 @@ java_sdk_library {
         proguard_flags_files: ["proguard.flags"],
     },
     aconfig_declarations: [
-        "permissions-aconfig-flags",
+        "android.permission.flags-aconfig",
+        "com.android.permission.flags-aconfig",
     ],
 }
 
diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt
index 5bba54616..659038e45 100644
--- a/service/jarjar-rules.txt
+++ b/service/jarjar-rules.txt
@@ -4,8 +4,6 @@ rule android.permission.flags.Flags com.android.permission.jarjar.@0
 rule android.util.IndentingPrintWriter com.android.permission.jarjar.@0
 rule com.android.internal.** com.android.permission.jarjar.@0
 rule com.android.modules.** com.android.permission.jarjar.@0
-rule com.android.permission.flags.*Flags* com.android.permission.jarjar.@0
-rule com.android.permission.flags.Flags com.android.permission.jarjar.@0
 rule com.android.role.*Proto com.android.permission.jarjar.@0
 # TODO(b/236200992): Revisit addition of rule com.android.safetycenter.annotations,
 # com.android.safetycenter.internaldata, com.android.safetycenter.pendingintents and
@@ -16,4 +14,4 @@ rule com.android.safetycenter.pendingintents.** com.android.permission.jarjar.@0
 rule com.android.safetycenter.resources.** com.android.permission.jarjar.@0
 rule com.google.protobuf.** com.android.permission.jarjar.@0
 rule kotlin.** com.android.permission.jarjar.@0
-rule com.android.permissioncontroller.PermissionControllerStatsLog com.android.permission.jarjar.@0
\ No newline at end of file
+rule com.android.permissioncontroller.PermissionControllerStatsLog com.android.permission.jarjar.@0
diff --git a/tests/cts/permission/Android.bp b/tests/cts/permission/Android.bp
index ed7fcea25..965a9eb58 100644
--- a/tests/cts/permission/Android.bp
+++ b/tests/cts/permission/Android.bp
@@ -53,7 +53,7 @@ android_test {
         "sts-device-util",
         "platform-test-rules",
         "CtsVirtualDeviceCommonLib",
-        "android.permission.flags-aconfig-java",
+        "android.permission.flags-aconfig-java-export",
         "androidx.test.rules",
     ],
     jni_libs: [
diff --git a/tests/cts/permissionmultidevice/Android.bp b/tests/cts/permissionmultidevice/Android.bp
index a4ad3cab7..fc4c1ddaf 100644
--- a/tests/cts/permissionmultidevice/Android.bp
+++ b/tests/cts/permissionmultidevice/Android.bp
@@ -37,7 +37,7 @@ android_test {
         "android.companion.virtual.flags-aconfig-java",
         "permission-test-util-lib",
         "permission-multidevice-test-util-lib",
-        "android.permission.flags-aconfig-java",
+        "android.permission.flags-aconfig-java-export",
         "collector-device-lib",
     ],
     data: [
diff --git a/tests/cts/permissionui/Android.bp b/tests/cts/permissionui/Android.bp
index 58f190ae8..c4ff0e069 100644
--- a/tests/cts/permissionui/Android.bp
+++ b/tests/cts/permissionui/Android.bp
@@ -43,7 +43,7 @@ android_test {
         "platform-test-rules",
         "platform-test-annotations",
         "android.content.pm.flags-aconfig-java-export",
-        "android.permission.flags-aconfig-java",
+        "android.permission.flags-aconfig-java-export",
     ],
     data: [
         ":CtsPermissionPolicyApp25",
diff --git a/tests/cts/role/Android.bp b/tests/cts/role/Android.bp
index ce07bd01d..e392109db 100644
--- a/tests/cts/role/Android.bp
+++ b/tests/cts/role/Android.bp
@@ -28,7 +28,7 @@ android_test {
     ],
 
     static_libs: [
-        "android.permission.flags-aconfig-java",
+        "android.permission.flags-aconfig-java-export",
         "androidx.test.rules",
         "compatibility-device-util-axt",
         "ctstestrunner-axt",
diff --git a/tests/functional/safetycenter/multiusers/Android.bp b/tests/functional/safetycenter/multiusers/Android.bp
index 2f1cda9ed..30024221b 100644
--- a/tests/functional/safetycenter/multiusers/Android.bp
+++ b/tests/functional/safetycenter/multiusers/Android.bp
@@ -36,7 +36,7 @@ android_test {
         "Harrier",
         "Nene",
         "TestApp",
-        "permissions-aconfig-flags-lib",
+        "com.android.permission.flags-aconfig-java-export",
     ],
     test_suites: [
         "general-tests",
diff --git a/tests/utils/safetycenter/Android.bp b/tests/utils/safetycenter/Android.bp
index 8514b0662..43d761f44 100644
--- a/tests/utils/safetycenter/Android.bp
+++ b/tests/utils/safetycenter/Android.bp
@@ -36,7 +36,7 @@ android_library {
         "kotlinx-coroutines-android",
         "safety-center-internal-data",
         "safety-center-resources-lib",
-        "permissions-aconfig-flags-lib",
+        "com.android.permission.flags-aconfig-java-export",
     ],
     apex_available: [
         "com.android.permission",