Merge 37c48b61c93430f037b63f5d97ff30672c0a8ae7 on remote branch

Change-Id: I72dfde9bbdaa4fc025df1aad76095b041a5e5405
diff --git a/qva/vendor/anorak/file.te b/qva/vendor/anorak/file.te
index af90edb..a7e93d0 100644
--- a/qva/vendor/anorak/file.te
+++ b/qva/vendor/anorak/file.te
@@ -32,6 +32,7 @@
 # nordic node file
 type vendor_nordic_sysfs_node, sysfs_type, fs_type;
 
+type vendor_ttyKXR2, dev_type, file_type;
 
 # kineticsxr file
 type vendor_kx_file, file_type, vendor_file_type;
diff --git a/qva/vendor/anorak/file_contexts b/qva/vendor/anorak/file_contexts
index 2b3f35e..26c5299 100644
--- a/qva/vendor/anorak/file_contexts
+++ b/qva/vendor/anorak/file_contexts
@@ -33,9 +33,9 @@
 /(vendor|system/vendor)/bin/hw/vendor\.kineticsxr\.hardware\.nordic@1\.0-service u:object_r:vendor_hal_nordic_default_exec:s0
 /sys/devices/platform/soc/990000\.spi/spi_master/spi0/spi0\.0/jsrequest u:object_r:vendor_nordic_sysfs_node:s0
 /sys/devices/platform/soc/990000\.spi/spi_master/spi0/spi0\.0/jsmem u:object_r:vendor_nordic_sysfs_node:s0
-
+/dev/ttyKXR2                          u:object_r:vendor_ttyKXR2:s0
 # kineticsxr file
-/etc/resources_ctrlr(/.*)?			u:object_r:vendor_kx_file:s0
+/etc/resources_ctrlr(/.*)?            u:object_r:vendor_kx_file:s0
 
 # calib partition
 /mnt/vendor/calib(/.*)?               u:object_r:vendor_calib_file:s0
diff --git a/qva/vendor/anorak/hal_nordic_default.te b/qva/vendor/anorak/hal_nordic_default.te
index fa644e9..bb9f919 100644
--- a/qva/vendor/anorak/hal_nordic_default.te
+++ b/qva/vendor/anorak/hal_nordic_default.te
@@ -34,4 +34,5 @@
 allow vendor_hal_nordic_default dmabuf_system_heap_device:chr_file { read open ioctl };
 allow vendor_hal_nordic_default mnt_vendor_file:dir r_dir_perms;
 allow vendor_hal_nordic_default vendor_calib_file:dir r_dir_perms;
-allow vendor_hal_nordic_default vendor_calib_file:file rw_file_perms;
\ No newline at end of file
+allow vendor_hal_nordic_default vendor_calib_file:file rw_file_perms;
+allow vendor_hal_nordic_default vendor_ttyKXR2:chr_file rw_file_perms;