commit a06d193f151eb8ae9c1863732cc5445d1288f73e
author Ruchi Kandoi <kandoiruchi@google.com> Tue Mar 28 18:29:14 2017 -0700
committer Rohit Rangwani <rrangwan@codeaurora.org> Tue Jul 04 12:48:44 2017 +0530
tree 036f46a7d5aa336ed5ba8ed8d3a432f34b03b774
parent d3dd3642ce93c04d886243f5181b68267fa048d2

Restrict HAL implementation access to only /data/vendor/nfc

Changes the storage file location to /data/vendor/nfc.

Test: Nfc boots up without any SELinux denials
Bug: 36645109
Change-Id: I78ae5c9f66baebc72e3312b0d394da77b96c03f9
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
(cherry picked from commit 387d192e2dabb35b38de29f04d89fe431ba01407)

halimpl/pn54x/utils/phNxpConfig.cpp

diff --git a/halimpl/pn54x/utils/phNxpConfig.cpp b/halimpl/pn54x/utils/phNxpConfig.cpp
index 15814ed..6d5a490 100644
--- a/halimpl/pn54x/utils/phNxpConfig.cpp
+++ b/halimpl/pn54x/utils/phNxpConfig.cpp
@@ -62,7 +62,7 @@
 #include <errno.h>
 
 #if GENERIC_TARGET
-const char alternative_config_path[] = "/data/nfc/";
+const char alternative_config_path[] = "/data/vendor/nfc/";
 #else
 const char alternative_config_path[] = "";
 #endif
@@ -85,7 +85,8 @@
 #define extra_config_ext        ".conf"
 #define     IsStringValue       0x80000000
 
-const char config_timestamp_path[] = "/data/nfc/libnfc-nxpConfigState.bin";
+const char config_timestamp_path[] =
+    "/data/vendor/nfc/libnfc-nxpConfigState.bin";
 const char default_nxp_config_path[] = "/etc/libnfc-nxp.conf";
 
 /**

halimpl/pn54x/utils/phNxpConfig.h

diff --git a/halimpl/pn54x/utils/phNxpConfig.h b/halimpl/pn54x/utils/phNxpConfig.h
index 3bdcad6..458647b 100644
--- a/halimpl/pn54x/utils/phNxpConfig.h
+++ b/halimpl/pn54x/utils/phNxpConfig.h
@@ -175,6 +175,6 @@
 #define DEBUG 0
 
 /* default configuration */
-#define default_storage_location "/data/nfc"
+#define default_storage_location "/data/vendor/nfc"
 
 #endif