diff options
| author | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-07-09 18:47:06 +0200 |
|---|---|---|
| committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-07-09 18:47:06 +0200 |
| commit | ea4af61a1b3c1199bef63f0f34a5fe8d5f4dd8d0 (patch) | |
| tree | cf0521497fe8b6e1da738229adf2debb0185d615 /ril/xmm6260/libril/ril.cpp | |
| parent | 40b78381e3996924c56fef8e3d0ffe8d0aba50d6 (diff) | |
| download | android_hardware_samsung-ea4af61a1b3c1199bef63f0f34a5fe8d5f4dd8d0.tar.gz android_hardware_samsung-ea4af61a1b3c1199bef63f0f34a5fe8d5f4dd8d0.tar.bz2 android_hardware_samsung-ea4af61a1b3c1199bef63f0f34a5fe8d5f4dd8d0.zip | |
samsung: libril: some code cleanup
Change-Id: Ie79369fce7d6c8832c3256c402a485090c177e61
Diffstat (limited to 'ril/xmm6260/libril/ril.cpp')
| -rwxr-xr-x | ril/xmm6260/libril/ril.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/ril/xmm6260/libril/ril.cpp b/ril/xmm6260/libril/ril.cpp index a1b148e..92b896c 100755 --- a/ril/xmm6260/libril/ril.cpp +++ b/ril/xmm6260/libril/ril.cpp @@ -632,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 { @@ -1518,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, |