Snap for 8746144 from 1313623b2e0361f37847a554d5327e1f785390c1 to mainline-os-statsd-release

Change-Id: I01ca0d9d40408224457dd482aca442b1da6dff86
diff --git a/vendor/qcom/common/file.te b/vendor/qcom/common/file.te
index aa14724..4ba1c4a 100644
--- a/vendor/qcom/common/file.te
+++ b/vendor/qcom/common/file.te
@@ -200,6 +200,8 @@
 # kgsl file type for sysfs access
 type sysfs_kgsl, sysfs_type, fs_type;
 type sysfs_kgsl_proc, sysfs_type, fs_type;
+type sysfs_kgsl_shell, sysfs_type, fs_type;
+
 # kgsl snapshot file type for sysfs access
 type sysfs_kgsl_snapshot, sysfs_type, fs_type;
 
@@ -338,4 +340,4 @@
 type modem_fdr_file, file_type, data_file_type;
 
 # Warm reset
-type sysfs_poweroff, sysfs_type, fs_type;
\ No newline at end of file
+type sysfs_poweroff, sysfs_type, fs_type;
diff --git a/vendor/qcom/common/genfs_contexts b/vendor/qcom/common/genfs_contexts
index 72cdede..29a9078 100644
--- a/vendor/qcom/common/genfs_contexts
+++ b/vendor/qcom/common/genfs_contexts
@@ -4,6 +4,7 @@
 genfscon sysfs /kernel/boot_slpi/boot                                                                                                  u:object_r:sysfs_msm_boot:s0
 genfscon sysfs /class/uio                                                                                                              u:object_r:sysfs_uio:s0
 genfscon sysfs /devices/virtual/kgsl/kgsl/proc                                                                                         u:object_r:sysfs_kgsl_proc:s0
+genfscon sysfs /devices/platform/soc/2c00000.qcom,kgsl-3d0/kgsl/kgsl-3d0/perfcounter                                                   u:object_r:sysfs_kgsl_shell:s0
 genfscon sysfs /devices/platform/soc/0.qcom,rmtfs_sharedmem                                                                            u:object_r:sysfs_rmtfs:s0
 genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp                                                                                 u:object_r:sysfs_msm_subsys:s0
 genfscon sysfs /devices/platform/soc/soc:qcom,spss_utils                                                                               u:object_r:sysfs_spss:s0
diff --git a/vendor/qcom/common/shell.te b/vendor/qcom/common/shell.te
new file mode 100644
index 0000000..cd0e4a4
--- /dev/null
+++ b/vendor/qcom/common/shell.te
@@ -0,0 +1,3 @@
+# allow shell users to control kgsl perfcounters
+allow shell sysfs_kgsl_shell:file rw_file_perms;
+allow shell sysfs_msm_subsys:dir r_dir_perms;