[Feature][ZXW-41] merged 0601 version

Change-Id: I667af6bb09d65581d455b73f8984c160b2c67ad8
diff --git a/ap/lib/libatext/ext_normal_func.c b/ap/lib/libatext/ext_normal_func.c
index 90116eb..3c170fa 100644
--- a/ap/lib/libatext/ext_normal_func.c
+++ b/ap/lib/libatext/ext_normal_func.c
@@ -1534,16 +1534,20 @@
 	{

 		*res_msg = at_err_build(retCode); 

 	}

-	if (cardSlotFlag == 1)

-	{

-		snprintf(tmp,sizeof(tmp),"%d,%d,%d,%d,%d",simCard0PreFlag, simCard0Flag, simCard1PreFlag, simCard1Flag, cardSlotFlag);

-	}

 	else

 	{

-		snprintf(tmp,sizeof(tmp),"%d,%d",simCard0PreFlag, simCard0Flag);

+		if (cardSlotFlag == 1)

+		{

+			snprintf(tmp,sizeof(tmp),"%d,%d,%d,%d,%d",simCard0PreFlag, simCard0Flag, simCard1PreFlag, simCard1Flag, cardSlotFlag);

+		}

+		else

+		{

+			snprintf(tmp,sizeof(tmp),"%d,%d",simCard0PreFlag, simCard0Flag);

+		}

+		

+		*res_msg = at_query_result_build("ZCARDSWITCH", tmp);

 	}

 	

-	*res_msg = at_query_result_build("ZCARDSWITCH", tmp);

 	*res_msglen = strlen(*res_msg);

 	return AT_END;

 }