Skip to content
Snippets Groups Projects
Commit a5647da3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove rules blocking vrcore_app to connect to VR HWC and VirtualTouchpad" into oc-dev

parents a9d7b895 52276383
No related branches found
No related tags found
No related merge requests found
...@@ -549,6 +549,8 @@ full_treble_only(` ...@@ -549,6 +549,8 @@ full_treble_only(`
-nfc_service -nfc_service
-radio_service -radio_service
-surfaceflinger_service -surfaceflinger_service
-virtual_touchpad_service
-vr_hwc_service
-vr_manager_service -vr_manager_service
}:service_manager find; }:service_manager find;
neverallow { neverallow {
......
...@@ -7,6 +7,3 @@ add_service(virtual_touchpad, virtual_touchpad_service) ...@@ -7,6 +7,3 @@ add_service(virtual_touchpad, virtual_touchpad_service)
# Requires access to /dev/uinput to create and feed the virtual device. # Requires access to /dev/uinput to create and feed the virtual device.
allow virtual_touchpad uhid_device:chr_file { w_file_perms ioctl }; 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;
...@@ -8,6 +8,7 @@ binder_use(vr_hwc) ...@@ -8,6 +8,7 @@ binder_use(vr_hwc)
binder_service(vr_hwc) binder_service(vr_hwc)
binder_call(vr_hwc, surfaceflinger) binder_call(vr_hwc, surfaceflinger)
# TODO(dnicoara): Remove once vr_wm is disabled.
binder_call(vr_hwc, vr_wm) binder_call(vr_hwc, vr_wm)
add_service(vr_hwc, vr_hwc_service) add_service(vr_hwc, vr_hwc_service)
...@@ -24,6 +25,3 @@ allow vr_hwc ion_device:chr_file r_file_perms; ...@@ -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 # Allow connection to VR DisplayClient to get the primary display metadata
# (ie: size). # (ie: size).
use_pdx(vr_hwc, surfaceflinger) 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;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment