Merge "Export SettingsLib flags for PermissionController" into main
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 2f843f9..8547ec1 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -1809,12 +1809,25 @@
name: "aconfig_settingslib_flags",
package: "com.android.settingslib.flags",
container: "system",
+ exportable: true,
srcs: [
"packages/SettingsLib/aconfig/settingslib.aconfig",
],
}
java_aconfig_library {
+ name: "aconfig_settingslib_exported_flags_java_lib",
+ aconfig_declarations: "aconfig_settingslib_flags",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+ mode: "exported",
+ min_sdk_version: "30",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.permission",
+ ],
+}
+
+java_aconfig_library {
name: "aconfig_settingslib_flags_java_lib",
aconfig_declarations: "aconfig_settingslib_flags",
defaults: ["framework-minus-apex-aconfig-java-defaults"],
diff --git a/packages/SettingsLib/aconfig/settingslib.aconfig b/packages/SettingsLib/aconfig/settingslib.aconfig
index 1a043d5..d82b58e 100644
--- a/packages/SettingsLib/aconfig/settingslib.aconfig
+++ b/packages/SettingsLib/aconfig/settingslib.aconfig
@@ -97,6 +97,7 @@
name: "settings_catalyst"
namespace: "android_settings"
description: "Settings catalyst project migration"
+ is_exported: true
bug: "323791114"
is_exported: true
}
@@ -106,6 +107,7 @@
is_fixed_read_only: true
namespace: "android_settings"
description: "Enable WRITE_SYSTEM_PREFERENCE permission and appop"
+ is_exported: true
bug: "375193223"
is_exported: true
}