diff --git a/private/file_contexts b/private/file_contexts index 0b81d4cc6c30bb4af88b09f74a227048e9e994c1..4251f921a198fd90b047b861087fe85cf14bd2e8 100644 --- a/private/file_contexts +++ b/private/file_contexts @@ -58,7 +58,6 @@ /dev/adf-interface[0-9]*\.[0-9]* u:object_r:graphics_device:s0 /dev/adf-overlay-engine[0-9]*\.[0-9]* u:object_r:graphics_device:s0 /dev/alarm u:object_r:alarm_device:s0 -/dev/android_adb.* u:object_r:adb_device:s0 /dev/ashmem u:object_r:ashmem_device:s0 /dev/audio.* u:object_r:audio_device:s0 /dev/binder u:object_r:binder_device:s0 diff --git a/public/adbd.te b/public/adbd.te index 59ee3e13124380bab6a20d0061fcd652862cf9b2..17a98d911b400a6742a2f402c7d1adaaf104b643 100644 --- a/public/adbd.te +++ b/public/adbd.te @@ -20,8 +20,7 @@ allow adbd self:capability setpcap; # Create and use network sockets. net_domain(adbd) -# Access /dev/android_adb or /dev/usb-ffs/adb/ep0 -allow adbd adb_device:chr_file rw_file_perms; +# Access /dev/usb-ffs/adb/ep0 allow adbd functionfs:dir search; allow adbd functionfs:file rw_file_perms; diff --git a/public/device.te b/public/device.te index 93f3e8896b84c823ce16573c67da9926d7f6286b..6866330c169a243ca51bb4a6f778b779e6d8c8a4 100644 --- a/public/device.te +++ b/public/device.te @@ -1,7 +1,6 @@ # Device types type device, dev_type, fs_type; type alarm_device, dev_type, mlstrustedobject; -type adb_device, dev_type; type ashmem_device, dev_type, mlstrustedobject; type audio_device, dev_type; type audio_timer_device, dev_type; diff --git a/public/recovery.te b/public/recovery.te index 7805d0b4350872e04124de5daa5be8da46dedae8..9bab7e2f7f4bf500aa33d83070a97345596c2f65 100644 --- a/public/recovery.te +++ b/public/recovery.te @@ -58,8 +58,7 @@ recovery_only(` allow recovery kernel:system syslog_read; - # Access /dev/android_adb or /dev/usb-ffs/adb/ep0 - allow recovery adb_device:chr_file rw_file_perms; + # Access /dev/usb-ffs/adb/ep0 allow recovery functionfs:dir search; allow recovery functionfs:file rw_file_perms;