[Feature][ZXW-33]merge ZXW 0428 version

Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/ap/lib/libvoice/voice.c b/ap/lib/libvoice/voice.c
index 696c2ea..fbc8bf1 100644
--- a/ap/lib/libvoice/voice.c
+++ b/ap/lib/libvoice/voice.c
@@ -22,6 +22,8 @@
 #include <sys/ioctl.h>

 #include <fcntl.h>

 #include <tinyalsa/audio_mixer_ctrl.h>

+#include "voice_lib.h"

+

 

 #define VOICE_DEV_NAME "/dev/voice_device"

 

@@ -216,6 +218,11 @@
 			return 0;

 		}

 	}

+#ifdef _ALSA_CODEC_IN_CAP

+

+		printf("%s: i2s and codec not need config,return!\n",__func__);	

+		return 0;

+#endif

 

 

 	//open mixer dev for codec control

@@ -298,6 +305,10 @@
 			return ;

 		}

 	}

+#ifdef _ALSA_CODEC_IN_CAP

+		printf("%s: i2s and codec not need config,return!\n",__func__); 

+		return ;

+#endif

 

 

 	if (volte_pcm_voice_out) {