summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher N. Hesse <raymanfx@gmail.com>2018-02-13 23:51:12 +0100
committerChristopher N. Hesse <raymanfx@gmail.com>2018-02-16 02:21:22 +0000
commitc60828f25339aef8f772137c663b847c630a3f44 (patch)
treedbf1954039c91956da6fde55ea73fd60269e7b90
parent507e8ce5bffb36fae8b1cd4e5498fa19a6273ee6 (diff)
downloadandroid_hardware_samsung-c60828f25339aef8f772137c663b847c630a3f44.tar.gz
android_hardware_samsung-c60828f25339aef8f772137c663b847c630a3f44.tar.bz2
android_hardware_samsung-c60828f25339aef8f772137c663b847c630a3f44.zip
ril: Add support for roamingProtocol parcel member
This is needed for Samsung devices like the Galaxy A5 2017. Change-Id: I549130b838377d8a8668ac59b51c314fe9e7f5ab
-rw-r--r--ril/libril/Android.mk4
-rwxr-xr-xril/libril/ril.cpp9
2 files changed, 13 insertions, 0 deletions
diff --git a/ril/libril/Android.mk b/ril/libril/Android.mk
index b0f982d..85ec40c 100644
--- a/ril/libril/Android.mk
+++ b/ril/libril/Android.mk
@@ -43,6 +43,10 @@ ifeq ($(BOARD_MODEM_NEEDS_VIDEO_CALL_FIELD), true)
LOCAL_CFLAGS += -DNEEDS_VIDEO_CALL_FIELD
endif
+ifeq ($(BOARD_NEEDS_ROAMING_PROTOCOL_FIELD), true)
+LOCAL_CFLAGS += -DNEEDS_ROAMING_PROTOCOL_FIELD
+endif
+
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
LOCAL_C_INCLUDES += external/nanopb-c
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include
diff --git a/ril/libril/ril.cpp b/ril/libril/ril.cpp
index 60ee153..405e415 100755
--- a/ril/libril/ril.cpp
+++ b/ril/libril/ril.cpp
@@ -1854,9 +1854,18 @@ static void dispatchSetInitialAttachApn(Parcel &p, RequestInfo *pRI)
pf.username = strdupReadString(p);
pf.password = strdupReadString(p);
+#ifdef NEEDS_ROAMING_PROTOCOL_FIELD
+ pf.roamingProtocol = strdupReadString(p);
+ if (pf.roamingProtocol == NULL)
+ pf.roamingProtocol = "IP";
+#endif
+
startRequest;
appendPrintBuf("%sapn=%s, protocol=%s, authtype=%d, username=%s, password=%s",
printBuf, pf.apn, pf.protocol, pf.authtype, pf.username, pf.password);
+#ifdef NEEDS_ROAMING_PROTOCOL_FIELD
+ appendPrintBuf("%sroamingProtocol=%s", printBuf, pf.roamingProtocol);
+#endif
closeRequest;
printRequest(pRI->token, pRI->pCI->requestNumber);