Merge "Merge 24Q3 to AOSP main" into main

2 files changed, 37 insertions, 14 deletions

diff --git a/flags/Android.bp b/flags/Android.bp
index 5d1a9eb24..34619cd95 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.stubs.module_lib"],
+    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.stubs.module_lib"],
+    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 3077dd290..a81de8144 100644
--- a/flags/flags.aconfig
+++ b/flags/flags.aconfig
@@ -2,15 +2,8 @@ package: "com.android.permission.flags"
 container: "com.android.permission"
 
 flag {
-    name: "device_aware_permission_grant_enabled"
-    is_fixed_read_only: true
-    namespace: "permissions"
-    description: "Enables device aware grant permission flow"
-    bug: "292252664"
-}
-
-flag {
     name: "private_profile_supported"
+    is_exported: true
     namespace: "permissions"
     description: "This flag is used to support private profile in safety center"
     bug: "286539356"
@@ -19,6 +12,7 @@ flag {
 
 flag {
     name: "private_profile_title_api"
+    is_exported: true
     namespace: "permissions"
     description: "This flag is used to guard the private profile title api in safety center"
     bug: "286539356"
@@ -27,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"
@@ -35,8 +30,18 @@ flag {
 
 flag {
     name: "archiving_read_only"
+    is_exported: true
     namespace: "permissions"
     description: "Feature flag to enable the archiving feature."
     bug: "278553670"
     is_fixed_read_only: true
-}
\ No newline at end of file
+}
+
+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"
+    is_fixed_read_only: true
+}