Merge "Delete unused property ro.apk_verity.mode" into main
diff --git a/build/soong/selinux_test.go b/build/soong/selinux_test.go
index dd980a5..beecf9f 100644
--- a/build/soong/selinux_test.go
+++ b/build/soong/selinux_test.go
@@ -72,7 +72,7 @@
`),
).RunTest(t).TestContext
- collectorModule := ctx.ModuleForTests("se_flags_collector", "").Module()
+ collectorModule := ctx.ModuleForTests(t, "se_flags_collector", "").Module()
collectorData, ok := android.OtherModuleProvider(ctx.OtherModuleProviderAdaptor(), collectorModule, buildFlagsProviderKey)
if !ok {
t.Errorf("se_flags_collector must provide buildFlags")
diff --git a/contexts/Android.bp b/contexts/Android.bp
index 638f202..cf7c175 100644
--- a/contexts/Android.bp
+++ b/contexts/Android.bp
@@ -87,6 +87,14 @@
},
}
+// The platform file context without any extra added. This is used by CTS to
+// ensure that no entries are removed from the AOSP file.
+file_contexts {
+ name: "plat_file_contexts_cts",
+ defaults: ["contexts_flags_defaults"],
+ srcs: [":file_contexts_files{.plat_private}"],
+}
+
file_contexts {
name: "plat_file_contexts.recovery",
defaults: ["contexts_flags_defaults"],
diff --git a/private/mmd.te b/private/mmd.te
index 3efb00f..1c0eca1 100644
--- a/private/mmd.te
+++ b/private/mmd.te
@@ -5,7 +5,7 @@
init_daemon_domain(mmd)
-# Set mmd.enabled_aconfig properties.
+# Set mmd.enabled_aconfig and zram backing device size.
set_prop(mmd, mmd_status_prop)
get_prop(mmd, mmd_prop)
get_prop(mmd, device_config_mmd_native_prop)
diff --git a/private/property_contexts b/private/property_contexts
index db00f56..f9a6535 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -1822,3 +1822,4 @@
mmd. u:object_r:mmd_prop:s0
mmd.zram.enabled u:object_r:mmd_shared_prop:s0 exact bool
mmd.enabled_aconfig u:object_r:mmd_status_prop:s0 exact bool
+mmd.status. u:object_r:mmd_status_prop:s0
diff --git a/private/system_server.te b/private/system_server.te
index 92caa60..4e5112e 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -849,6 +849,9 @@
# Read device's serial number from system properties
get_prop(system_server, serialno_prop)
+# Read whether uvc gadget is enabled
+get_prop(system_server, usb_uvc_enabled_prop)
+
# Read/write the property which keeps track of whether this is the first start of system_server
set_prop(system_server, firstboot_prop)