Merge "Fix wificond permissions for hikey" am: 62a225ff

am: d8d0c9d5

Change-Id: I479448c613d19d83d96caf251879d2a2c629b355

wificond.te

@@ -19,11 +19,15 @@ set_prop(wificond, ctl_default_prop)
 
 # create sockets to set interfaces up and down
 allow wificond self:udp_socket create_socket_perms;
+# See discussion in b/31226503
+allowxperm wificond self:udp_socket ioctl unpriv_sock_ioctls;
 # setting interface state up/down is a privileged ioctl
 allowxperm wificond self:udp_socket ioctl { SIOCSIFFLAGS };
 allow wificond self:capability { net_admin net_raw };
 # allow wificond to speak to nl80211 in the kernel
 allow wificond self:netlink_socket create_socket_perms;
+# newer kernels (e.g. 4.4 but not 4.1) have a new class for sockets
+allow wificond self:netlink_generic_socket create_socket_perms;
 
 r_dir_file(wificond, proc_net)