From a3bc3cffdfd6abfcdd3cde26eb543619b183efa2 Mon Sep 17 00:00:00 2001 From: Josh Gao <jmgao@google.com> Date: Wed, 11 Jan 2017 14:58:28 -0800 Subject: [PATCH] Remove support for legacy f_adb interface. Bug: http://b/34228376 Test: m Change-Id: I1321ada1521bb3e3fd08105f1a41d519ee486683 --- private/file_contexts | 1 - public/adbd.te | 3 +-- public/device.te | 1 - public/recovery.te | 3 +-- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/private/file_contexts b/private/file_contexts index 0b81d4cc6..4251f921a 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 59ee3e131..17a98d911 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 93f3e8896..6866330c1 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 7805d0b43..9bab7e2f7 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; -- GitLab