Revert "Allow the MediaProvider app to set FUSE passthrough property"
This reverts commit c1e2918fd9d08fa4e20e0004cd8760246b690726.
Reason for revert: Build broke
Change-Id: I4b95e977cf66c586b0d0b465f1b3654c01074152
diff --git a/private/app.te b/private/app.te
index e738745..94d24e0 100644
--- a/private/app.te
+++ b/private/app.te
@@ -4,8 +4,6 @@
get_prop(appdomain, boot_status_prop)
get_prop(appdomain, dalvik_config_prop)
-# TODO(b/187912701) restrict the scope of fuse_passthrough_prop
-get_prop(appdomain, fuse_passthrough_prop)
get_prop(appdomain, media_config_prop)
get_prop(appdomain, packagemanager_config_prop)
get_prop(appdomain, radio_control_prop)
diff --git a/private/compat/30.0/30.0.cil b/private/compat/30.0/30.0.cil
index 7dd65e2..9f40876 100644
--- a/private/compat/30.0/30.0.cil
+++ b/private/compat/30.0/30.0.cil
@@ -2071,10 +2071,7 @@
(typeattributeset system_ndebug_socket_30_0 (system_ndebug_socket))
(typeattributeset system_net_netd_hwservice_30_0 (system_net_netd_hwservice))
(typeattributeset system_passwd_file_30_0 (system_passwd_file))
-(typeattributeset system_prop_30_0 (
- system_prop
- fuse_passthrough_prop
-))
+(typeattributeset system_prop_30_0 (system_prop))
(typeattributeset system_radio_prop_30_0 (system_radio_prop usb_prop))
(typeattributeset system_seccomp_policy_file_30_0 (system_seccomp_policy_file))
(typeattributeset system_security_cacerts_file_30_0 (system_security_cacerts_file))
diff --git a/private/mediaprovider_app.te b/private/mediaprovider_app.te
index d1908fb..0e4a50e 100644
--- a/private/mediaprovider_app.te
+++ b/private/mediaprovider_app.te
@@ -54,8 +54,3 @@
get_prop(mediaprovider_app, drm_service_config_prop)
allow mediaprovider_app gpu_device:dir search;
-
-# Allow MediaProvider to set system properties.
-# This is required to let other services know that FUSE passthrough is enabled
-# on the device (b/186635810).
-set_prop(mediaprovider_app, fuse_passthrough_prop)
diff --git a/private/property_contexts b/private/property_contexts
index f964561..5af4bb7 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -1185,6 +1185,3 @@
# bootanimation properties
ro.bootanim.quiescent.enabled u:object_r:bootanim_config_prop:s0 exact bool
-
-# FUSE Passthrough properties
-fuse.passthrough.enabled u:object_r:fuse_passthrough_prop:s0 exact bool
diff --git a/private/shell.te b/private/shell.te
index 83526a6..5831d54 100644
--- a/private/shell.te
+++ b/private/shell.te
@@ -197,6 +197,3 @@
# Allow ReadDefaultFstab() for CTS.
read_fstab(shell)
-
-# Allow shell to read FUSE passthrough properties
-get_prop(shell, fuse_passthrough_prop)
diff --git a/public/property.te b/public/property.te
index 35a3e42..5edb59e 100644
--- a/public/property.te
+++ b/public/property.te
@@ -68,7 +68,6 @@
system_restricted_prop(build_prop)
system_restricted_prop(charger_status_prop)
system_restricted_prop(fingerprint_prop)
-system_restricted_prop(fuse_passthrough_prop)
system_restricted_prop(hal_instrumentation_prop)
system_restricted_prop(init_service_status_prop)
system_restricted_prop(libc_debug_prop)
