allow WifiService to use tracing on user builds am: 723364f1

am: 9d6237a8

Change-Id: Ia369d26adeb07495beaf406055f6a4689acd54ab

private/system_server.te

@@ -629,11 +629,9 @@ allow system_server sysfs_leds:file rw_file_perms;
 allow system_server sysfs_leds:dir r_dir_perms;
 ###
 
-userdebug_or_eng(`
-  # Allow WifiService to start, stop, and read wifi-specific trace events.
-  allow system_server debugfs_tracing_instances:dir search;
-  allow system_server debugfs_wifi_tracing:file rw_file_perms;
-')
+# Allow WifiService to start, stop, and read wifi-specific trace events.
+allow system_server debugfs_tracing_instances:dir search;
+allow system_server debugfs_wifi_tracing:file rw_file_perms;
 
 ###
 ### Neverallow rules

public/init.te

@@ -188,12 +188,10 @@ allow init dev_type:lnk_file create;
 # Disable tracing by writing to /sys/kernel/debug/tracing/tracing_on
 allow init tracing_shell_writable:file w_file_perms;
 
-userdebug_or_eng(`
-  # Setup and control wifi event tracing (see wifi-events.rc)
-  allow init debugfs_tracing_instances:dir create_dir_perms;
-  allow init debugfs_tracing_instances:file w_file_perms;
-  allow init debugfs_wifi_tracing:file w_file_perms;
-')
+# Setup and control wifi event tracing (see wifi-events.rc)
+allow init debugfs_tracing_instances:dir create_dir_perms;
+allow init debugfs_tracing_instances:file w_file_perms;
+allow init debugfs_wifi_tracing:file w_file_perms;
 
 # chown/chmod on pseudo files.
 allow init { fs_type -contextmount_type -sdcard_type -rootfs }:file { open read setattr };