Squashed 'LYNQ_PUBLIC/' changes from e9b56460d..6f35c858b
6f35c858b [Feature][T8TSK-304] modify lynq_media_play_audio to wait 3s
e9ae0c258 [Bugfix][T106BUG-253][ril] call lynq_get_urc_info, return 7000 2
545abdd8c Merge "[Bugfix][API-1532] add dbus macro in wpa-supplicant under platform env"
8e01a420d [Bugfix][API-1532] add dbus macro in wpa-supplicant under platform env
git-subtree-dir: LYNQ_PUBLIC
git-subtree-split: 6f35c858b88b8fffff4207c3fbb80107933f8ac0
Change-Id: Iee1dbae19dc70e46225e3ed118cbd5f65694c426
diff --git a/IC_meta/mtk/2735/lynq-wg870/lynq-wg870.bb b/IC_meta/mtk/2735/lynq-wg870/lynq-wg870.bb
index bb94fa3..b52c8d8 100755
--- a/IC_meta/mtk/2735/lynq-wg870/lynq-wg870.bb
+++ b/IC_meta/mtk/2735/lynq-wg870/lynq-wg870.bb
@@ -45,6 +45,12 @@
export CONFIG_DRIVER_NL80211_IFX=y
export CONFIG_WEP=y
+ if [ "${CONNMAN_SUPPORT}" = "yes" ]; then
+ sed -i "s/^#CONFIG_CTRL_IFACE_DBUS_NEW=y/CONFIG_CTRL_IFACE_DBUS_NEW=y/" ${S}wpa_supplicant/.config
+ else
+ sed -i "s/^CONFIG_CTRL_IFACE_DBUS_NEW=y/#CONFIG_CTRL_IFACE_DBUS_NEW=y/" ${S}wpa_supplicant/.config
+ fi
+
if test "${PACKAGE_ARCH}" = "cortexa7hf-vfp-vfpv4-neon" || test "${PACKAGE_ARCH}" = "cortexa7hf-neon-vfpv4"; then
oe_runmake all ROOT=${STAGING_DIR_HOST} OFLAGS="--sysroot=${STAGING_DIR_HOST} -mhard-float"
else
diff --git a/common_src/lib/liblynq-media/liblynq-media/media_control.c b/common_src/lib/liblynq-media/liblynq-media/media_control.c
index 20e9a8a..92a8db3 100755
--- a/common_src/lib/liblynq-media/liblynq-media/media_control.c
+++ b/common_src/lib/liblynq-media/liblynq-media/media_control.c
@@ -588,8 +588,8 @@
}
else
{
- if (cnt==6){
- RLOGD ("After 6s, not enter playing state.\n");
+ if (cnt==30){
+ RLOGD ("After 3s, not enter playing state.\n");
lynq_media_stop_audio();
return 1;
}
diff --git a/common_src/lib/liblynq-network/lynq_network.cpp b/common_src/lib/liblynq-network/lynq_network.cpp
index 414fcbf..ca07f55 100755
--- a/common_src/lib/liblynq-network/lynq_network.cpp
+++ b/common_src/lib/liblynq-network/lynq_network.cpp
@@ -1088,7 +1088,7 @@
return LYNQ_E_PARAMETER_ANONALY;
}
if((handle ==RIL_UNSOL_SIGNAL_STRENGTH && NULL == solSigStren) ||
- (handle ==RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED && NULL == slot_id))
+ (handle !=RIL_UNSOL_SIGNAL_STRENGTH && NULL == slot_id))
{
LYINFLOG("incoming solSigStren or slot_id is NULL!!!");
return LYNQ_E_PARAMETER_ANONALY;