resolve merge conflicts of a2d30231 to oc-mr1-dev-plus-aosp

Change-Id: Id7355a7acacfb8ccfe1ef9d562469f914ad3bf2a

private/compat/26.0/26.0.ignore.cil

@@ -36,8 +36,11 @@
     thermalserviced_tmpfs
     timezone_service
     tombstoned_java_trace_socket
-    tombstoned_java_trace_socket
-    vold_service))
+    vold_service
+    wpantund
+    wpantund_exec
+    wpantund_service
+    wpantund_tmpfs))
 
 ;; private_objects - a collection of types that were labeled differently in
 ;;     older policy, but that should not remain accessible to vendor policy.

private/file_contexts

@@ -259,6 +259,7 @@
 /system/bin/thermalserviced      u:object_r:thermalserviced_exec:s0
 /system/bin/webview_zygote32     u:object_r:webview_zygote_exec:s0
 /system/bin/webview_zygote64     u:object_r:webview_zygote_exec:s0
+/system/bin/wpantund             u:object_r:wpantund_exec:s0
 /system/bin/virtual_touchpad     u:object_r:virtual_touchpad_exec:s0
 /system/bin/hw/android\.hidl\.allocator@1\.0-service          u:object_r:hal_allocator_default_exec:s0
 /system/etc/selinux/mapping/[0-9]+\.[0-9]+\.cil       u:object_r:sepolicy_file:s0

private/system_server.te

@@ -180,6 +180,7 @@ binder_call(system_server, incidentd)
 binder_call(system_server, netd)
 binder_call(system_server, vold)
 binder_call(system_server, wificond)
+binder_call(system_server, wpantund)
 binder_service(system_server)
 
 # Use HALs

private/wpantund.te

+typeattribute wpantund coredomain;
+
+init_daemon_domain(wpantund)

public/service.te

@@ -150,3 +150,4 @@ type wifi_service, app_api_service, system_server_service, service_manager_type;
 type wificond_service, service_manager_type;
 type wifiaware_service, app_api_service, system_server_service, service_manager_type;
 type window_service, system_api_service, system_server_service, service_manager_type;
+type wpantund_service, system_api_service, service_manager_type;

public/wpantund.te

+type wpantund, domain;
+type wpantund_exec, exec_type, file_type;
+
+hal_client_domain(wpantund, hal_lowpan)
+net_domain(wpantund)
+
+binder_use(wpantund)
+binder_call(wpantund, system_server)
+
+# wpantund needs to be able to check in with the lowpan_service
+allow wpantund lowpan_service:service_manager find;
+
+# create sockets to set interfaces up and down, add multicast groups, etc.
+allow wpantund self:udp_socket create_socket_perms;
+
+# setting interface state up/down and changing MTU are privileged ioctls
+allowxperm wpantund self:udp_socket ioctl { SIOCSIFFLAGS SIOCSIFMTU };
+
+# Allow us to bring up a TUN network interface.
+allow wpantund tun_device:chr_file rw_file_perms;
+allow wpantund self:capability { net_admin net_raw };
+allow wpantund self:tun_socket create;