Revert "Add qemu.hw.mainkeys to system property_contexts"
Revert submission 1582845-qemu-prop
Reason for revert: aosp_hawk-userdebug is broken on an RVC branch
Reverted Changes:
Idfc2bffa5:Add qemu.hw.mainkeys to system property_contexts
If013ff33f:Remove qemu.hw.mainkeys from vendor_qemu_prop
Bug: 180412668
Change-Id: I335afb931eaeb019f66e3feedea80b0c8888f7a3
diff --git a/private/compat/30.0/30.0.ignore.cil b/private/compat/30.0/30.0.ignore.cil
index 61c073a..3eace95 100644
--- a/private/compat/30.0/30.0.ignore.cil
+++ b/private/compat/30.0/30.0.ignore.cil
@@ -75,7 +75,6 @@
profcollectd_data_file
profcollectd_exec
profcollectd_service
- qemu_hw_prop
radio_core_data_file
reboot_readiness_service
remote_prov_app
diff --git a/private/platform_app.te b/private/platform_app.te
index a112081..7bf14c8 100644
--- a/private/platform_app.te
+++ b/private/platform_app.te
@@ -90,9 +90,6 @@
# allow platform apps to read keyguard.no_require_sim
get_prop(platform_app, keyguard_config_prop)
-# allow platform apps to read qemu.hw.mainkeys
-get_prop(platform_app, qemu_hw_prop)
-
# allow platform apps to create symbolic link
allow platform_app app_data_file:lnk_file create_file_perms;
diff --git a/private/property_contexts b/private/property_contexts
index 1e248d4..8778016 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -186,9 +186,6 @@
dalvik. u:object_r:dalvik_prop:s0
ro.dalvik. u:object_r:dalvik_prop:s0
-# qemu_hw_prop is read/written by both system and vendor.
-qemu.hw.mainkeys u:object_r:qemu_hw_prop:s0
-
# Shared between system server and wificond
wifi. u:object_r:wifi_prop:s0
wlan. u:object_r:wifi_prop:s0
diff --git a/private/system_server.te b/private/system_server.te
index 479f85e..e1919e2 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -1318,6 +1318,3 @@
# Only system server can write the font files.
neverallow { domain -init -system_server } font_data_file:file no_w_file_perms;
neverallow { domain -init -system_server } font_data_file:dir no_w_dir_perms;
-
-# Read qemu.hw.mainkeys property
-get_prop(system_server, qemu_hw_prop)
diff --git a/public/property.te b/public/property.te
index 3f3f148..37884f0 100644
--- a/public/property.te
+++ b/public/property.te
@@ -191,7 +191,6 @@
system_public_prop(nfc_prop)
system_public_prop(ota_prop)
system_public_prop(powerctl_prop)
-system_public_prop(qemu_hw_prop)
system_public_prop(radio_control_prop)
system_public_prop(radio_prop)
system_public_prop(serialno_prop)
diff --git a/public/vendor_init.te b/public/vendor_init.te
index 5a0382d..685317b 100644
--- a/public/vendor_init.te
+++ b/public/vendor_init.te
@@ -233,7 +233,6 @@
set_prop(vendor_init, logd_prop)
set_prop(vendor_init, log_tag_prop)
set_prop(vendor_init, log_prop)
-set_prop(vendor_init, qemu_hw_prop)
set_prop(vendor_init, radio_control_prop)
set_prop(vendor_init, rebootescrow_hal_prop)
set_prop(vendor_init, serialno_prop)