Merge "IPACM : Add support for the XLAT feature"
diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index ceae2b8..d9f3145 100644
--- a/ipacm/src/Android.mk
+++ b/ipacm/src/Android.mk
@@ -78,8 +78,14 @@
endef
-IPACM_FILE_LIST := IPACM_cfg.xml
-$(foreach TEST,$(IPACM_FILE_LIST),$(eval $(call ADD_TEST,$(TEST))))
+include $(CLEAR_VARS)
+LOCAL_MODULE := IPACM_cfg.xml
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+LOCAL_MODULE_OWNER := ipacm
+include $(BUILD_PREBUILT)
endif # not (TARGET_USES_AOSP)
endif # $(TARGET_ARCH)
diff --git a/ipacm/src/IPACM_Main.cpp b/ipacm/src/IPACM_Main.cpp
index 94c9518..1e3cce7 100644
--- a/ipacm/src/IPACM_Main.cpp
+++ b/ipacm/src/IPACM_Main.cpp
@@ -612,6 +612,8 @@
case WLAN_SWITCH_TO_SCC:
IPACMDBG_H("Received WLAN_SWITCH_TO_SCC\n");
+ case WLAN_WDI_ENABLE:
+ IPACMDBG_H("Received WLAN_WDI_ENABLE\n");
if (IPACM_Iface::ipacmcfg->isMCC_Mode == true)
{
IPACM_Iface::ipacmcfg->isMCC_Mode = false;
@@ -621,6 +623,8 @@
continue;
case WLAN_SWITCH_TO_MCC:
IPACMDBG_H("Received WLAN_SWITCH_TO_MCC\n");
+ case WLAN_WDI_DISABLE:
+ IPACMDBG_H("Received WLAN_WDI_DISABLE\n");
if (IPACM_Iface::ipacmcfg->isMCC_Mode == false)
{
IPACM_Iface::ipacmcfg->isMCC_Mode == true;