From 5656f81f62c7ef8c477f5f3e70af10dbd940d394 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Wed, 18 Aug 2021 12:59:29 +0800 Subject: [PATCH] reuse gs101 confirmation UI Bug: 196916111 Test: boot with confirmation UI started Change-Id: I39ff3c0eecb017bb78118a1f7b42c8ce87eda971 --- legacy/device.te | 1 - legacy/file_contexts | 2 -- legacy/hal_confirmationui.te | 13 ------------- legacy/securedpud.slider.te | 9 --------- 4 files changed, 25 deletions(-) delete mode 100644 legacy/hal_confirmationui.te delete mode 100644 legacy/securedpud.slider.te diff --git a/legacy/device.te b/legacy/device.te index fa0bb724..55205990 100644 --- a/legacy/device.te +++ b/legacy/device.te @@ -15,7 +15,6 @@ type vendor_secmem_device, dev_type; type vendor_toe_device, dev_type; type custom_ab_block_device, dev_type; type devinfo_block_device, dev_type; -type tui_device, dev_type; # usbpd type logbuffer_device, dev_type; diff --git a/legacy/file_contexts b/legacy/file_contexts index 4c70a385..53fe573f 100644 --- a/legacy/file_contexts +++ b/legacy/file_contexts @@ -89,7 +89,6 @@ /dev/g2d u:object_r:graphics_device:s0 /dev/tsmux u:object_r:video_device:s0 /dev/repeater u:object_r:video_device:s0 -/dev/tui-driver u:object_r:tui_device:s0 /dev/logbuffer_usbpd u:object_r:logbuffer_device:s0 /dev/logbuffer_ssoc u:object_r:logbuffer_device:s0 /dev/logbuffer_wireless u:object_r:logbuffer_device:s0 @@ -306,7 +305,6 @@ /vendor/bin/trusty_metricsd u:object_r:trusty_metricsd_exec:s0 /vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.trusty u:object_r:hal_gatekeeper_default_exec:s0 /vendor/bin/hw/android\.hardware\.security\.keymint-service\.trusty u:object_r:hal_keymint_default_exec:s0 -/vendor/bin/hw/android\.hardware\.confirmationui@1\.0-service\.trusty\.vendor u:object_r:hal_confirmationui_default_exec:s0 /dev/trusty-ipc-dev0 u:object_r:tee_device:s0 /data/vendor/ss(/.*)? u:object_r:tee_data_file:s0 /mnt/vendor/persist/ss(/.*)? u:object_r:tee_data_file:s0 diff --git a/legacy/hal_confirmationui.te b/legacy/hal_confirmationui.te deleted file mode 100644 index a8f4ae8c..00000000 --- a/legacy/hal_confirmationui.te +++ /dev/null @@ -1,13 +0,0 @@ -allow hal_confirmationui_default tee_device:chr_file rw_file_perms; - -binder_call(hal_confirmationui_default, keystore) - -vndbinder_use(hal_confirmationui_default) -binder_call(hal_confirmationui_default, citadeld) -allow hal_confirmationui_default citadeld_service:service_manager find; - -allow hal_confirmationui_default input_device:chr_file rw_file_perms; -allow hal_confirmationui_default input_device:dir r_dir_perms; - -allow hal_confirmationui_default dmabuf_system_heap_device:chr_file r_file_perms; -allow hal_confirmationui_default ion_device:chr_file r_file_perms; diff --git a/legacy/securedpud.slider.te b/legacy/securedpud.slider.te deleted file mode 100644 index fd553a30..00000000 --- a/legacy/securedpud.slider.te +++ /dev/null @@ -1,9 +0,0 @@ -type securedpud_slider, domain; -type securedpud_slider_exec, exec_type, vendor_file_type, file_type; - -init_daemon_domain(securedpud_slider) - -allow securedpud_slider dmabuf_heap_device:chr_file r_file_perms; -allow securedpud_slider ion_device:chr_file r_file_perms; -allow securedpud_slider tee_device:chr_file rw_file_perms; -allow securedpud_slider tui_device:chr_file rw_file_perms;