summaryrefslogtreecommitdiffstats
path: root/ril/xmm6260
diff options
context:
space:
mode:
Diffstat (limited to 'ril/xmm6260')
-rwxr-xr-xril/xmm6260/libril/ril.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/ril/xmm6260/libril/ril.cpp b/ril/xmm6260/libril/ril.cpp
index d3573e3..92b896c 100755
--- a/ril/xmm6260/libril/ril.cpp
+++ b/ril/xmm6260/libril/ril.cpp
@@ -361,8 +361,6 @@ processCommandBuffer(void *buffer, size_t buflen) {
int index;
int ret;
- ALOGE("processCommandBuffer: enter");
-
p.setData((uint8_t *) buffer, buflen);
// status checked at end
@@ -406,10 +404,8 @@ processCommandBuffer(void *buffer, size_t buflen) {
/* sLastDispatchedToken = token; */
- ALOGE("processCommandBuffer: dispatchFunction()");
pRI->pCI->dispatchFunction(p, pRI);
- ALOGE("processCommandBuffer: exit");
return 0;
}
@@ -636,7 +632,6 @@ dispatchDial (Parcel &p, RequestInfo *pRI) {
}
if (s_callbacks.version < 3) { // Remove when partners upgrade to version 3
- ALOGE("dispatchDial: s_callbacks.version < 3");
uusPresent = 0;
sizeOfDial = sizeof(dial) - sizeof(RIL_UUS_Info *);
} else {
@@ -1522,8 +1517,17 @@ static int responseCallList(Parcel &p, void *response, size_t responselen) {
p.writeInt32(p_cur->numberPresentation);
writeStringToParcel(p, p_cur->name);
p.writeInt32(p_cur->namePresentation);
- p.writeInt32(0); /* UUS Information is absent */
-
+ // Remove when partners upgrade to version 3
+ if ((s_callbacks.version < 3) || (p_cur->uusInfo == NULL || p_cur->uusInfo->uusData == NULL)) {
+ p.writeInt32(0); /* UUS Information is absent */
+ } else {
+ RIL_UUS_Info *uusInfo = p_cur->uusInfo;
+ p.writeInt32(1); /* UUS Information is present */
+ p.writeInt32(uusInfo->uusType);
+ p.writeInt32(uusInfo->uusDcs);
+ p.writeInt32(uusInfo->uusLength);
+ p.write(uusInfo->uusData, uusInfo->uusLength);
+ }
appendPrintBuf("%s[id=%d,%s,toa=%d,",
printBuf,
p_cur->index,