Merge "Add feature flag for flagging manifest entries" into main

1 files changed, 9 insertions, 0 deletions

diff --git a/core/java/android/content/res/flags.aconfig b/core/java/android/content/res/flags.aconfig
index 0c2c0f494257..b0e234232f09 100644
--- a/core/java/android/content/res/flags.aconfig
+++ b/core/java/android/content/res/flags.aconfig
@@ -8,3 +8,12 @@ flag {
     # fixed_read_only or device wont boot because of permission issues accessing flags during boot
     is_fixed_read_only: true
 }
+
+flag {
+    name: "manifest_flagging"
+    namespace: "resource_manager"
+    description: "Feature flag for flagging manifest entries"
+    bug: "297373084"
+    # This flag is read in PackageParser at boot time, and in aapt2 which is a build tool.
+    is_fixed_read_only: true
+}