Remove vrflinger
Not used anymore.
Test: build + presubmit
Bug: 170681929
Change-Id: I3ac9b842f89acf620e9f08516e44977d83064f2f
diff --git a/private/compat/31.0/31.0.cil b/private/compat/31.0/31.0.cil
index f3abde4..362b412 100644
--- a/private/compat/31.0/31.0.cil
+++ b/private/compat/31.0/31.0.cil
@@ -3,6 +3,8 @@
(type apex_permission_data_file)
(type apex_scheduling_data_file)
(type apex_wifi_data_file)
+(type vr_hwc)
+(type vr_hwc_exec)
(expandtypeattribute (DockObserver_service_31_0) true)
(expandtypeattribute (IProxyService_service_31_0) true)
diff --git a/private/file_contexts b/private/file_contexts
index 55b9e41..18be045 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -357,7 +357,6 @@
/system/etc/task_profiles\.json u:object_r:task_profiles_file:s0
/system/etc/task_profiles/task_profiles_[0-9]+\.json u:object_r:task_profiles_api_file:s0
/system/usr/share/zoneinfo(/.*)? u:object_r:system_zoneinfo_file:s0
-/system/bin/vr_hwc u:object_r:vr_hwc_exec:s0
/system/bin/adbd u:object_r:adbd_exec:s0
/system/bin/vold_prepare_subdirs u:object_r:vold_prepare_subdirs_exec:s0
/system/bin/stats u:object_r:stats_exec:s0
diff --git a/private/service_contexts b/private/service_contexts
index 335004e..dffc6b4 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -308,8 +308,6 @@
voiceinteraction u:object_r:voiceinteraction_service:s0
vold u:object_r:vold_service:s0
vpn_management u:object_r:vpn_management_service:s0
-vr_hwc u:object_r:vr_hwc_service:s0
-vrflinger_vsync u:object_r:vrflinger_vsync_service:s0
vrmanager u:object_r:vr_manager_service:s0
wallpaper u:object_r:wallpaper_service:s0
webviewupdate u:object_r:webviewupdate_service:s0
diff --git a/private/surfaceflinger.te b/private/surfaceflinger.te
index 9900600..e88efd0 100644
--- a/private/surfaceflinger.te
+++ b/private/surfaceflinger.te
@@ -91,8 +91,6 @@
#add_service(surfaceflinger, surfaceflinger_service)
allow surfaceflinger surfaceflinger_service:service_manager { add find };
-add_service(surfaceflinger, vrflinger_vsync_service)
-
allow surfaceflinger mediaserver_service:service_manager find;
allow surfaceflinger permission_service:service_manager find;
allow surfaceflinger power_service:service_manager find;
diff --git a/private/system_app.te b/private/system_app.te
index 239686e..6cf993a 100644
--- a/private/system_app.te
+++ b/private/system_app.te
@@ -93,7 +93,6 @@
-tracingproxy_service
-virtual_touchpad_service
-vold_service
- -vr_hwc_service
-default_android_service
}:service_manager find;
# suppress denials for services system_app should not be accessing.
@@ -105,7 +104,6 @@
netd_service
virtual_touchpad_service
vold_service
- vr_hwc_service
}:service_manager find;
# suppress denials caused by debugfs_tracing
diff --git a/private/vr_hwc.te b/private/vr_hwc.te
deleted file mode 100644
index 053c03d..0000000
--- a/private/vr_hwc.te
+++ /dev/null
@@ -1,6 +0,0 @@
-typeattribute vr_hwc coredomain;
-
-# Daemon started by init.
-init_daemon_domain(vr_hwc)
-
-hal_server_domain(vr_hwc, hal_graphics_composer)
diff --git a/public/domain.te b/public/domain.te
index 423d59c..95b59d8 100644
--- a/public/domain.te
+++ b/public/domain.te
@@ -685,7 +685,6 @@
-nfc_service
-radio_service
-virtual_touchpad_service
- -vr_hwc_service
-vr_manager_service
userdebug_or_eng(`-hal_face_service')
}:service_manager find;
diff --git a/public/dumpstate.te b/public/dumpstate.te
index 23711c3..b1f186c 100644
--- a/public/dumpstate.te
+++ b/public/dumpstate.te
@@ -255,7 +255,6 @@
-gatekeeper_service
-virtual_touchpad_service
-vold_service
- -vr_hwc_service
-default_android_service
}:service_manager find;
# suppress denials for services dumpstate should not be accessing.
@@ -265,7 +264,6 @@
gatekeeper_service
virtual_touchpad_service
vold_service
- vr_hwc_service
}:service_manager find;
# Most of these are neverallowed.
diff --git a/public/shell.te b/public/shell.te
index 70a7fb4..5fd9079 100644
--- a/public/shell.te
+++ b/public/shell.te
@@ -89,7 +89,6 @@
-system_suspend_control_service
-virtual_touchpad_service
-vold_service
- -vr_hwc_service
-default_android_service
}:service_manager find;
allow shell dumpstate:binder call;
diff --git a/public/traceur_app.te b/public/traceur_app.te
index ce9b844..03c4944 100644
--- a/public/traceur_app.te
+++ b/public/traceur_app.te
@@ -15,7 +15,6 @@
-netd_service
-virtual_touchpad_service
-vold_service
- -vr_hwc_service
-default_android_service
}:service_manager find;
diff --git a/public/vr_hwc.te b/public/vr_hwc.te
deleted file mode 100644
index c146887..0000000
--- a/public/vr_hwc.te
+++ /dev/null
@@ -1,33 +0,0 @@
-type vr_hwc, domain;
-type vr_hwc_exec, system_file_type, exec_type, file_type;
-
-# Get buffer metadata.
-hal_client_domain(vr_hwc, hal_graphics_allocator)
-
-binder_use(vr_hwc)
-binder_service(vr_hwc)
-
-binder_call(vr_hwc, surfaceflinger)
-# Needed to check for app permissions.
-binder_call(vr_hwc, system_server)
-
-add_service(vr_hwc, vr_hwc_service)
-
-# Hosts the VR HWC implementation and provides a simple Binder interface for VR
-# Window Manager to receive the layers/buffers.
-hwbinder_use(vr_hwc)
-
-# Load vendor libraries.
-allow vr_hwc system_file:dir r_dir_perms;
-
-allow vr_hwc ion_device:chr_file r_file_perms;
-
-# Allow connection to VR DisplayClient to get the primary display metadata
-# (ie: size).
-pdx_client(vr_hwc, display_client)
-
-# Requires access to the permission service to validate that clients have the
-# appropriate VR permissions.
-allow vr_hwc permission_service:service_manager find;
-
-allow vr_hwc vrflinger_vsync_service:service_manager find;