From 5b75c5763c96714af841f9ae4d0606228fb1615a Mon Sep 17 00:00:00 2001
From: Simon Shields <simon@lineageos.org>
Date: Mon, 13 Feb 2017 10:26:17 +1100
Subject: [PATCH] libril: fix parceling of DataCallListV6 on xmm626x

Change-Id: I32fee851e65f8f5af3d57fc4fc588139ff6ded35
---
 ril/libril/ril.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ril/libril/ril.cpp b/ril/libril/ril.cpp
index c4490260..4478ea22 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;