Merge "Remove rules blocking vrcore_app to connect to VR HWC and...

Merge "Remove rules blocking vrcore_app to connect to VR HWC and VirtualTouchpad" into oc-dev am: a5647da3
am: 8784e1e7

Change-Id: Ie065c69ad1c0b97265d9cb1f520902fc19d27f6c

public/domain.te

@@ -552,6 +552,8 @@ full_treble_only(`
     -nfc_service
     -radio_service
     -surfaceflinger_service
+    -virtual_touchpad_service
+    -vr_hwc_service
     -vr_manager_service
   }:service_manager find;
   neverallow {

public/virtual_touchpad.te

@@ -7,6 +7,3 @@ add_service(virtual_touchpad, virtual_touchpad_service)
 
 # Requires access to /dev/uinput to create and feed the virtual device.
 allow virtual_touchpad uhid_device:chr_file { w_file_perms ioctl };
-
-# Limit access so that nothing else can inject input.
-neverallow { domain -virtual_touchpad -vr_wm } virtual_touchpad_service:service_manager find;

public/vr_hwc.te

@@ -8,6 +8,7 @@ binder_use(vr_hwc)
 binder_service(vr_hwc)
 
 binder_call(vr_hwc, surfaceflinger)
+# TODO(dnicoara): Remove once vr_wm is disabled.
 binder_call(vr_hwc, vr_wm)
 
 add_service(vr_hwc, vr_hwc_service)
@@ -24,6 +25,3 @@ allow vr_hwc ion_device:chr_file r_file_perms;
 # Allow connection to VR DisplayClient to get the primary display metadata
 # (ie: size).
 use_pdx(vr_hwc, surfaceflinger)
-
-# Limit access so only vr_wm can connect.
-neverallow { domain -vr_hwc -vr_wm } vr_hwc_service:service_manager find;