summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jared Finder <jfinder@google.com> 2024-10-12 00:02:36 +0000
committer Jared Finder <jfinder@google.com> 2024-10-15 20:33:42 +0000
commit7c6980cb38999434b355e689475aa4d2e3a637ff (patch)
treeae2d5185822936b6ee8245573281e10d7bef73bb
parentb42301696d74623bf3cc1712f4fad2fd4dbca649 (diff)
Add new flag for XR-specific manifest entries
This flag will be used to add new XR-specific permission strings and feature strings. Bug: 364416355 Flag: android.xr.xr_manifest_entries Test: Checked that project still built. Change-Id: I554ab816d81dbe329deedf304218691109f7c7c5
-rw-r--r--AconfigFlags.bp15
-rw-r--r--core/java/android/content/pm/xr.aconfig9
2 files changed, 24 insertions, 0 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index c6ce799f0a24..6105ab5518c8 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -81,6 +81,7 @@ aconfig_declarations_group {
"android.view.inputmethod.flags-aconfig-java",
"android.webkit.flags-aconfig-java",
"android.widget.flags-aconfig-java",
+ "android.xr.flags-aconfig-java",
"art_exported_aconfig_flags_lib",
"backstage_power_flags_lib",
"backup_flags_lib",
@@ -893,6 +894,20 @@ java_aconfig_library {
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+// XR
+aconfig_declarations {
+ name: "android.xr.flags-aconfig",
+ package: "android.xr",
+ container: "system",
+ srcs: ["core/java/android/content/pm/xr.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.xr.flags-aconfig-java",
+ aconfig_declarations: "android.xr.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
// android.app
aconfig_declarations {
name: "android.app.flags-aconfig",
diff --git a/core/java/android/content/pm/xr.aconfig b/core/java/android/content/pm/xr.aconfig
new file mode 100644
index 000000000000..61835c162c49
--- /dev/null
+++ b/core/java/android/content/pm/xr.aconfig
@@ -0,0 +1,9 @@
+package: "android.xr"
+container: "system"
+
+flag {
+ namespace: "xr"
+ name: "xr_manifest_entries"
+ description: "Adds manifest entries used by Android XR"
+ bug: "364416355"
+} \ No newline at end of file