summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Shields <simon@lineageos.org>2017-02-13 10:26:17 +1100
committerSimon Shields <simon@lineageos.org>2017-02-13 10:26:17 +1100
commit5b75c5763c96714af841f9ae4d0606228fb1615a (patch)
treedc54f8eae7d796321fd08425327a12186b6cdff1
parentcaece2d972717c9dbf3afe6833e323fe76e1ad4a (diff)
downloadandroid_hardware_samsung-5b75c5763c96714af841f9ae4d0606228fb1615a.tar.gz
android_hardware_samsung-5b75c5763c96714af841f9ae4d0606228fb1615a.tar.bz2
android_hardware_samsung-5b75c5763c96714af841f9ae4d0606228fb1615a.zip
libril: fix parceling of DataCallListV6 on xmm626x
Change-Id: I32fee851e65f8f5af3d57fc4fc588139ff6ded35
-rwxr-xr-xril/libril/ril.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/ril/libril/ril.cpp b/ril/libril/ril.cpp
index c449026..4478ea2 100755
--- a/ril/libril/ril.cpp
+++ b/ril/libril/ril.cpp
@@ -2710,7 +2710,11 @@ static int responseDataCallListV6(Parcel &p, void *response, size_t responselen)
writeStringToParcel(p, p_cur[i].ifname);
writeStringToParcel(p, p_cur[i].addresses);
writeStringToParcel(p, p_cur[i].dnses);
+#if defined(MODEM_TYPE_XMM6262) || defined(MODEM_TYPE_XMM6260)
+ writeStringToParcel(p, p_cur[i].addresses);
+#else
writeStringToParcel(p, p_cur[i].gateways);
+#endif
appendPrintBuf("%s[status=%d,retry=%d,cid=%d,%s,%s,%s,%s,%s,%s],", printBuf,
p_cur[i].status,
p_cur[i].suggestedRetryTime,
@@ -2720,7 +2724,12 @@ static int responseDataCallListV6(Parcel &p, void *response, size_t responselen)
(char*)p_cur[i].ifname,
(char*)p_cur[i].addresses,
(char*)p_cur[i].dnses,
- (char*)p_cur[i].gateways);
+#if defined(MODEM_TYPE_XMM6262) || defined(MODEM_TYPE_XMM6260)
+ (char*)p_cur[i].addresses
+#else
+ (char*)p_cur[i].gateways
+#endif
+ );
}
removeLastChar;
closeResponse;