Merge "Define RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES" into main
diff --git a/aconfig/next/Android.bp b/aconfig/next/Android.bp
index 32a13b8..94aa162 100644
--- a/aconfig/next/Android.bp
+++ b/aconfig/next/Android.bp
@@ -20,6 +20,7 @@
"aconfig-values-aosp-next-com.android.server.display.feature.flags-all",
"aconfig-values-aosp-next-com.android.settings.flags-all",
"aconfig-values-aosp-next-com.android.media.flags-all",
+ "aconfig-values-aosp-next-com.android.libcore-all",
"aconfig-values-aosp-next-com.android.systemui.accessibility.accessibilitymenu-all",
"aconfig-values-aosp-next-com.android.input.flags-all",
"aconfig-values-aosp-next-com.android.server.companion.virtual-all",
diff --git a/aconfig/next/com.android.libcore/Android.bp b/aconfig/next/com.android.libcore/Android.bp
new file mode 100644
index 0000000..daa6b15
--- /dev/null
+++ b/aconfig/next/com.android.libcore/Android.bp
@@ -0,0 +1,21 @@
+// Copyright 2024 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+aconfig_values {
+ name: "aconfig-values-aosp-next-com.android.libcore-all",
+ package: "com.android.libcore",
+ srcs: [
+ "*_flag_values.textproto",
+ ],
+}
diff --git a/aconfig/next/com.android.libcore/v_apis_flag_values.textproto b/aconfig/next/com.android.libcore/v_apis_flag_values.textproto
new file mode 100644
index 0000000..3d1363e
--- /dev/null
+++ b/aconfig/next/com.android.libcore/v_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.libcore"
+ name: "v_apis"
+ state: ENABLED
+ permission: READ_ONLY
+}
diff --git a/aconfig/trunk_food/Android.bp b/aconfig/trunk_food/Android.bp
index 2885e64..a98c164 100644
--- a/aconfig/trunk_food/Android.bp
+++ b/aconfig/trunk_food/Android.bp
@@ -22,6 +22,7 @@
"aconfig-values-aosp-trunk_food-com.android.graphics.libgui.flags-all",
"aconfig-values-aosp-trunk_food-com.android.server.power.optimization-all",
"aconfig-values-aosp-trunk_food-android.hardware.usb.flags-all",
+ "aconfig-values-aosp-trunk_food-com.android.libcore-all",
"aconfig-values-aosp-trunk_food-com.android.media.audioserver-all",
"aconfig-values-aosp-trunk_food-android.app.job-all",
"aconfig-values-aosp-trunk_food-com.android.bluetooth.flags-all",
diff --git a/aconfig/trunk_food/com.android.libcore/Android.bp b/aconfig/trunk_food/com.android.libcore/Android.bp
new file mode 100644
index 0000000..655ecaa
--- /dev/null
+++ b/aconfig/trunk_food/com.android.libcore/Android.bp
@@ -0,0 +1,21 @@
+// Copyright 2024 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+aconfig_values {
+ name: "aconfig-values-aosp-trunk_food-com.android.libcore-all",
+ package: "com.android.libcore",
+ srcs: [
+ "*_flag_values.textproto",
+ ],
+}
diff --git a/aconfig/trunk_food/com.android.libcore/v_apis_flag_values.textproto b/aconfig/trunk_food/com.android.libcore/v_apis_flag_values.textproto
new file mode 100644
index 0000000..3d1363e
--- /dev/null
+++ b/aconfig/trunk_food/com.android.libcore/v_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.libcore"
+ name: "v_apis"
+ state: ENABLED
+ permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/Android.bp b/aconfig/trunk_staging/Android.bp
index 14826c9..ec34ff1 100644
--- a/aconfig/trunk_staging/Android.bp
+++ b/aconfig/trunk_staging/Android.bp
@@ -47,6 +47,7 @@
"aconfig-values-aosp-trunk_staging-android.companion.virtualdevice.flags-all",
"aconfig-values-aosp-trunk_staging-android.app.admin.flags-all",
"aconfig-values-aosp-trunk_staging-android.hardware.usb.flags-all",
+ "aconfig-values-aosp-trunk_staging-com.android.libcore-all",
"aconfig-values-aosp-trunk_staging-com.android.nfc.flags-all",
"aconfig-values-aosp-trunk_staging-com.android.wm.shell-all",
"aconfig-values-aosp-trunk_staging-com.android.wifi.flags-all",
diff --git a/aconfig/trunk_staging/com.android.libcore/Android.bp b/aconfig/trunk_staging/com.android.libcore/Android.bp
new file mode 100644
index 0000000..4dd127b
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.libcore/Android.bp
@@ -0,0 +1,21 @@
+// Copyright 2024 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+aconfig_values {
+ name: "aconfig-values-aosp-trunk_staging-com.android.libcore-all",
+ package: "com.android.libcore",
+ srcs: [
+ "*_flag_values.textproto",
+ ],
+}
diff --git a/aconfig/trunk_staging/com.android.libcore/v_apis_flag_values.textproto b/aconfig/trunk_staging/com.android.libcore/v_apis_flag_values.textproto
new file mode 100644
index 0000000..3d1363e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.libcore/v_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+ package: "com.android.libcore"
+ name: "v_apis"
+ state: ENABLED
+ permission: READ_ONLY
+}
diff --git a/build_config/trunk_staging.scl b/build_config/trunk_staging.scl
index ef28987..938186e 100644
--- a/build_config/trunk_staging.scl
+++ b/build_config/trunk_staging.scl
@@ -55,6 +55,7 @@
value("RELEASE_PLATFORM_VERSION_LAST_STABLE", "14"),
value("RELEASE_PLATFORM_VNDK_VERSION", "35"),
value("RELEASE_SELINUX_DATA_DATA_IGNORE", True),
+ value("RELEASE_UNLOCKED_STORAGE_API", True),
# keep-sorted end
]
# Flags should be alphabetical by flag name to reduce merge conflifcts
diff --git a/build_flags.scl b/build_flags.scl
index 344bedc..96dad3c 100644
--- a/build_flags.scl
+++ b/build_flags.scl
@@ -210,6 +210,9 @@
# feature flag for a new API to open declared passthrough HAL
flag("RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL", ALL, False),
+ # flag to enable the unlocked-only storage API's SEPolicy rules
+ flag("RELEASE_UNLOCKED_STORAGE_API", ALL, False),
+
# feature flag for enabling use_resource_processor: true by default
flag("RELEASE_USE_RESOURCE_PROCESSOR_BY_DEFAULT", ALL, False),
