Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master" into stage-aosp-master
diff --git a/private/atrace.te b/private/atrace.te
index 0cdd35a..8de1826 100644
--- a/private/atrace.te
+++ b/private/atrace.te
@@ -28,6 +28,7 @@
 allow atrace healthd:binder call;
 allow atrace surfaceflinger:binder call;
 allow atrace system_server:binder call;
+allow atrace cameraserver:binder call;
 
 get_prop(atrace, hwservicemanager_prop)
 
diff --git a/public/domain.te b/public/domain.te
index a415646..bfc1860 100644
--- a/public/domain.te
+++ b/public/domain.te
@@ -742,16 +742,6 @@
   });
 ')
 
-  # Vendor domains (except netdomain) are not permitted to initiate communications to netd sockets
-full_treble_only(`
-  neverallow_establish_socket_comms({
-    domain
-    -coredomain
-    -netdomain
-    -socket_between_core_and_vendor_violators
-  }, netd);
-')
-
   # Vendor domains are not permitted to initiate create/open sockets owned by core domains
 full_treble_only(`
   neverallow {