[Bugfix][API-570][common] lynq_set_speech_volume lynq_get_speech_volume failure
Change-Id: I92a042cb74a2ec3c2478473827f1980944b2eaaa
diff --git a/framework/lynq-ril-service/src/cc.cpp b/framework/lynq-ril-service/src/cc.cpp
index d8dd3be..4040df3 100755
--- a/framework/lynq-ril-service/src/cc.cpp
+++ b/framework/lynq-ril-service/src/cc.cpp
@@ -815,14 +815,14 @@
}
}
if(pRI != NULL) {
- android::lynqAssemblyParcelheader(p,socket_id,LYNQ_REQUEST_RECORD,0,0);
+ android::lynqAssemblyParcelheader(p,socket_id,pRI->uToken,LYNQ_REQUEST_RECORD,0,0);
android::LYNQ_RIL_respSocket_sp(p,pRI);
free(pRI);
}
return 0;
FAIL_RETURN:
if(pRI != NULL) {
- android::lynqAssemblyParcelheader(p,socket_id,LYNQ_REQUEST_RECORD,0,2);
+ android::lynqAssemblyParcelheader(p,socket_id,pRI->uToken,LYNQ_REQUEST_RECORD,0,2);
android::LYNQ_RIL_respSocket_sp(p,pRI);
free(pRI);
}
@@ -850,7 +850,7 @@
RLOGD("setSpeechVolume start!");
if(argc < 2) {
- android::lynqAssemblyParcelheader(p,socket_id,LYNQ_REQUEST_SET_SPEECH_VOLUME,0,2);
+ android::lynqAssemblyParcelheader(p,socket_id,pRI->uToken,LYNQ_REQUEST_SET_SPEECH_VOLUME,0,2);
android::LYNQ_RIL_respSocket_sp(p,pRI);
free(pRI);
RLOGW("Warning: no set volume value!");
@@ -862,7 +862,7 @@
if (get_audio_path() == 0) {
if(setValue < MIN_VOLUME || setValue > MAX_VOLUME) {
RLOGW("Warning: set volume value is over-range!");
- android::lynqAssemblyParcelheader(p,socket_id,LYNQ_REQUEST_SET_SPEECH_VOLUME,0,2);
+ android::lynqAssemblyParcelheader(p,socket_id,pRI->uToken,LYNQ_REQUEST_SET_SPEECH_VOLUME,0,2);
android::LYNQ_RIL_respSocket_sp(p,pRI);
free(pRI);
return -1;
@@ -870,7 +870,7 @@
} else {
if(setValue < BT_MIN_VOLUME || setValue > BT_MAX_VOLUME) {
RLOGW("Warning: set bt volume value is over-range!");
- android::lynqAssemblyParcelheader(p,socket_id,LYNQ_REQUEST_SET_SPEECH_VOLUME,0,2);
+ android::lynqAssemblyParcelheader(p,socket_id,pRI->uToken,LYNQ_REQUEST_SET_SPEECH_VOLUME,0,2);
android::LYNQ_RIL_respSocket_sp(p,pRI);
free(pRI);
return -1;
@@ -878,7 +878,7 @@
}
//paramter is from 1 to 7
mixer_set_volume(setValue);
- android::lynqAssemblyParcelheader(p,socket_id,LYNQ_REQUEST_SET_SPEECH_VOLUME,0,0);
+ android::lynqAssemblyParcelheader(p,socket_id,pRI->uToken,LYNQ_REQUEST_SET_SPEECH_VOLUME,0,0);
printf(">>>>set speech Volume<<<< success value is %d!\n",setValue);
/*Warren add for t800 ril service 2021/12/23 end*/
android::LYNQ_RIL_respSocket_sp(p,pRI);
@@ -894,11 +894,11 @@
if(volumn <0) {
printf("get speech volumn fail, please check whether does call exsit.\n");
/*Warren add for t800 ril service 2021/12/23 start*/
- android::lynqAssemblyParcelheader(p,socket_id,LYNQ_REQUEST_GET_SPEECH_VOLUME,0,2);
+ android::lynqAssemblyParcelheader(p,socket_id,pRI->uToken,LYNQ_REQUEST_GET_SPEECH_VOLUME,0,2);
/*Warren add for t800 ril service 2021/12/23 end*/
} else {
/*Warren add for t800 ril service 2021/12/23 start*/
- android::lynqAssemblyParcelheader(p,socket_id,LYNQ_REQUEST_GET_SPEECH_VOLUME,0,0);
+ android::lynqAssemblyParcelheader(p,socket_id,pRI->uToken,LYNQ_REQUEST_GET_SPEECH_VOLUME,0,0);
/*Warren add for t800 ril service 2021/12/23 end*/
}
printf("current Speech Volume is%d",volumn);
@@ -918,7 +918,7 @@
if(argc < 2) {
RLOGW("Warning: no set volume value!");
printf("Warning: no set volume value!\n");
- android::lynqAssemblyParcelheader(p,socket_id,LYNQ_REQUEST_SET_DTMF_VOLUME,0,2);
+ android::lynqAssemblyParcelheader(p,socket_id,pRI->uToken,LYNQ_REQUEST_SET_DTMF_VOLUME,0,2);
android::LYNQ_RIL_respSocket_sp(p,pRI);
free(pRI);
return -1;
@@ -931,7 +931,7 @@
RLOGW("Warning: set volume value is over-range!");
printf("set dtmf Volume value is %d!\n",setValue);
/*Warren add for t800 ril service 2021/12/23 start*/
- android::lynqAssemblyParcelheader(p,socket_id,LYNQ_REQUEST_SET_DTMF_VOLUME,0,2);
+ android::lynqAssemblyParcelheader(p,socket_id,pRI->uToken,LYNQ_REQUEST_SET_DTMF_VOLUME,0,2);
android::LYNQ_RIL_respSocket_sp(p,pRI);
/*Warren add for t800 ril service 2021/12/23 end*/
free(pRI);
@@ -941,7 +941,7 @@
dtmf_volume = setValue;
printf(">>>>set dtmf Volume<<<< success value is %d!\n",setValue);
/*Warren add for t800 ril service 2021/12/23 start*/
- android::lynqAssemblyParcelheader(p,socket_id,LYNQ_REQUEST_SET_DTMF_VOLUME,0,0);
+ android::lynqAssemblyParcelheader(p,socket_id,pRI->uToken,LYNQ_REQUEST_SET_DTMF_VOLUME,0,0);
printf(">>>>set dtmf Volume<<<< success value is %d!\n",setValue);
/*Warren add for t800 ril service 2021/12/23 end*/
android::LYNQ_RIL_respSocket_sp(p,pRI);
@@ -1453,12 +1453,12 @@
int ret = setCallMute(mute);
if(ret) {
/*Warren add for t800 ril service 2021/12/23 start*/
- android::lynqAssemblyParcelheader(p,socket_id,RIL_REQUEST_SET_MUTE,0,2);
+ android::lynqAssemblyParcelheader(p,socket_id,pRI->uToken,RIL_REQUEST_SET_MUTE,0,2);
/*Warren add for t800 ril service 2021/12/23 start*/
printf("set mute fail, please try agian\n");
} else {
/*Warren add for t800 ril service 2021/12/23 start*/
- android::lynqAssemblyParcelheader(p,socket_id,RIL_REQUEST_SET_MUTE,0,0);
+ android::lynqAssemblyParcelheader(p,socket_id,pRI->uToken,RIL_REQUEST_SET_MUTE,0,0);
/*Warren add for t800 ril service 2021/12/23 start*/
}
/*Warren add for t800 ril service 2021/12/23 start*/
@@ -1482,11 +1482,11 @@
if(mute < 0) {
printf("get mute state fail, please check whether does call exsit.\n");
/*Warren add for t800 ril service 2021/12/23 start*/
- android::lynqAssemblyParcelheader(p,socket_id,RIL_REQUEST_GET_MUTE,0,2);
+ android::lynqAssemblyParcelheader(p,socket_id,pRI->uToken,RIL_REQUEST_GET_MUTE,0,2);
/*Warren add for t800 ril service 2021/12/23 end*/
} else {
/*Warren add for t800 ril service 2021/12/23 start*/
- android::lynqAssemblyParcelheader(p,socket_id,RIL_REQUEST_GET_MUTE,0,0);
+ android::lynqAssemblyParcelheader(p,socket_id,pRI->uToken,RIL_REQUEST_GET_MUTE,0,0);
/*Warren add for t800 ril service 2021/12/23 end*/
}
printf("current mute state is%s",((mute == 1) ? "on\n" : "off\n"));