commit 0d977bd687e627043e98e74182beac9a82538b7e
author Linux Build Service Account <lnxbuild@localhost> Tue Sep 30 14:42:01 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Sep 30 14:42:01 2014 -0700
tree ffdf4c587c3318ab8412e48409747a708a1a44f2
parent 543b70137e2edd462744a9a63571b05bbeb5e1a4
parent 31762e130a79e2b23616a372fe79ece76359eff3

Merge "IPACM: move the socket location in Android"

ipacm/inc/IPACM_Log.h

diff --git a/ipacm/inc/IPACM_Log.h b/ipacm/inc/IPACM_Log.h
index 1a49374..f2ed773 100644
--- a/ipacm/inc/IPACM_Log.h
+++ b/ipacm/inc/IPACM_Log.h
@@ -53,7 +53,7 @@
 #define MAX_BUF_LEN 256
 
 #ifdef FEATURE_IPA_ANDROID
-#define IPACMLOG_FILE "/data/ipacm_log_file"
+#define IPACMLOG_FILE "/dev/socket/ipacm_log_file"
 #else/* defined(FEATURE_IPA_ANDROID) */
 #define IPACMLOG_FILE "/etc/ipacm_log_file"
 #endif /* defined(NOT FEATURE_IPA_ANDROID)*/

ipacm/src/IPACM_Main.cpp

diff --git a/ipacm/src/IPACM_Main.cpp b/ipacm/src/IPACM_Main.cpp
index 1a1dd03..201334e 100644
--- a/ipacm/src/IPACM_Main.cpp
+++ b/ipacm/src/IPACM_Main.cpp
@@ -126,7 +126,7 @@
 #define IPACM_FIREWALL_FILE_NAME    "mobileap_firewall.xml"
 #define IPACM_CFG_FILE_NAME    "IPACM_cfg.xml"
 #ifdef FEATURE_IPA_ANDROID
-#define IPACM_PID_FILE "/data/ipacm.pid"
+#define IPACM_PID_FILE "/data/ipa/ipacm.pid"
 #define IPACM_DIR_NAME     "/data"
 #else/* defined(FEATURE_IPA_ANDROID) */
 #define IPACM_PID_FILE "/etc/ipacm.pid"