commit b06a5dea6045bcc4b020967dbb8326d27ea845ba
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Feb 02 00:01:04 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Feb 02 00:01:04 2022 +0000
tree 8ed51bf0e6503b5845c7b9a6ed1953671f9d2418
parent 6901602172a8baf5eed4f01e6172575081f960d1
parent 1bceb5408e4d34bdd4bd1142cdf31da288d75f95

Snap for 8139379 from 1bceb5408e4d34bdd4bd1142cdf31da288d75f95 to sc-qpr3-release

Change-Id: Id0741c2f6e250f449e3c09275e4fc71ce67eb541

shared/sepolicy/vendor/adbd.te

diff --git a/shared/sepolicy/vendor/adbd.te b/shared/sepolicy/vendor/adbd.te
index 4ed653a..d932066 100644
--- a/shared/sepolicy/vendor/adbd.te
+++ b/shared/sepolicy/vendor/adbd.te
@@ -1,9 +1,2 @@
 allow adbd self:{ socket vsock_socket } {create listen accept rw_socket_perms_no_ioctl};
-# TODO(b/130668487): Label the vsock sockets.
-allow adbd unlabeled:{socket vsock_socket} rw_socket_perms_no_ioctl;
 allow adbd kernel:system module_request;
-
-recovery_only(`
-# TODO(b/130668487): Label the vsock sockets.
-allow su unlabeled:{ socket vsock_socket } rw_socket_perms_no_ioctl;
-')

shared/sepolicy/vendor/shell.te

diff --git a/shared/sepolicy/vendor/shell.te b/shared/sepolicy/vendor/shell.te
index cc26032..2ef1897 100644
--- a/shared/sepolicy/vendor/shell.te
+++ b/shared/sepolicy/vendor/shell.te
@@ -1,5 +1,2 @@
 allow shell serial_device:chr_file { getattr ioctl read write };
 allow shell cuttlefish_sensor_injection_exec:file rx_file_perms;
-
-# TODO(b/130668487): Label the vsock sockets.
-allow shell adbd:{ socket vsock_socket } rw_socket_perms_no_ioctl;