Moves the framebuffer to the shared memory regions
- Eliminates all references to the previous file-based framebuffer
Bug: 70944937
Test: local
Change-Id: I5815a466c76cf545752648a41653269b3f991cab
(cherry picked from commit e771739caf1a8d42d2603832b53cbae013a55f0c)
diff --git a/shared/config/init.vsoc.rc b/shared/config/init.vsoc.rc
index 26d5766..4efe826 100644
--- a/shared/config/init.vsoc.rc
+++ b/shared/config/init.vsoc.rc
@@ -8,10 +8,6 @@
mkdir /var/run/system 0755 system root
mkdir /dev/gce 0750
chown system system /dev/gce
- write /dev/framebuffer_control 0
- chown system system /dev/framebuffer_control
- chmod 0660 /dev/framebuffer_control
- restorecon /dev/framebuffer_control
mount debugfs debugfs /sys/kernel/debug
chmod 0755 /sys/kernel/debug
diff --git a/shared/sepolicy/file.te b/shared/sepolicy/file.te
index bbbe4aa..28f7454 100644
--- a/shared/sepolicy/file.te
+++ b/shared/sepolicy/file.te
@@ -1,9 +1,7 @@
# File types
-type fb_ctl_file, file_type;
type initial_metadata_file, file_type;
type sensors_hal_socket, file_type;
# USB related portion of sysfs requiring privileged access, as opposed to sysfs_usb which is
type sysfs_usb_priv, sysfs_type, file_type;
type tombstone_snapshot_file, file_type;
-type userspace_fb_file, file_type;
type var_run_system_file, file_type;
diff --git a/shared/sepolicy/file_contexts b/shared/sepolicy/file_contexts
index 8804368..4579da8 100644
--- a/shared/sepolicy/file_contexts
+++ b/shared/sepolicy/file_contexts
@@ -5,8 +5,6 @@
/dev/e2e_manager u:object_r:region_e2e_test_device:s0
/dev/e2e_primary u:object_r:region_e2e_test_device:s0
/dev/e2e_secondary u:object_r:region_e2e_test_device:s0
-/dev/framebuffer_control u:object_r:fb_ctl_file:s0
-/dev/userspace_framebuffer u:object_r:userspace_fb_file:s0
/dev/vport[0-9]p[0-9]* u:object_r:virtual_serial_device:s0
#############################
diff --git a/shared/sepolicy/hal_graphics_allocator.te b/shared/sepolicy/hal_graphics_allocator.te
index ca372da..5975599 100644
--- a/shared/sepolicy/hal_graphics_allocator.te
+++ b/shared/sepolicy/hal_graphics_allocator.te
@@ -3,8 +3,3 @@
# Read GCE initial metadata file
allow hal_graphics_allocator_server initial_metadata_file:file r_file_perms;
-
-# Interact with the userspace framebuffer
-# TODO(b/64158954): Remove/update these rules once gralloc impl changes
-allow hal_graphics_allocator_server fb_ctl_file:file rw_file_perms;
-allow hal_graphics_allocator_server userspace_fb_file:file rw_file_perms;
diff --git a/shared/sepolicy/surfaceflinger.te b/shared/sepolicy/surfaceflinger.te
index e8edaf5..877d012 100644
--- a/shared/sepolicy/surfaceflinger.te
+++ b/shared/sepolicy/surfaceflinger.te
@@ -2,8 +2,3 @@
# Read GCE initial metadata file
allow surfaceflinger initial_metadata_file:file r_file_perms;
-
-# Interact with the userspace framebuffer
-# TODO(b/64158954): Remove/update these rules once gralloc impl changes
-allow surfaceflinger fb_ctl_file:file rw_file_perms;
-allow surfaceflinger userspace_fb_file:file rw_file_perms;
diff --git a/shared/sepolicy/vsoc_input_service.te b/shared/sepolicy/vsoc_input_service.te
index b5d463f..5c9e331 100644
--- a/shared/sepolicy/vsoc_input_service.te
+++ b/shared/sepolicy/vsoc_input_service.te
@@ -6,6 +6,3 @@
# I/O with /dev/uinput
allow vsoc_input_service uhid_device:chr_file rw_file_perms;
-# Framebuffer I/O (needed to obtain the screen size)
-allow vsoc_input_service fb_ctl_file:file rw_file_perms;
-allow vsoc_input_service userspace_fb_file:file rw_file_perms;