commit ffe632e35624519561df34208659092db2969544
author Christopher N. Hesse <raymanfx@gmail.com> Tue Feb 13 23:51:12 2018 +0100
committer Christopher N. Hesse <raymanfx@gmail.com> Thu Feb 22 21:02:04 2018 +0000
tree f691c44a0f978345390d5026e02bb792a0d3f5cf
parent c41b85cf57d436c69f9ebda39022ecf205fa284a

ril: Add support for roamingProtocol parcel member

This is needed for Samsung devices like the Galaxy A5 2017.

Change-Id: I549130b838377d8a8668ac59b51c314fe9e7f5ab

ril/libril/Android.mk

diff --git a/ril/libril/Android.mk b/ril/libril/Android.mk
index 056390f..46a596c 100644
--- a/ril/libril/Android.mk
+++ b/ril/libril/Android.mk
@@ -50,6 +50,10 @@
 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

ril/libril/ril_service.cpp

diff --git a/ril/libril/ril_service.cpp b/ril/libril/ril_service.cpp
index f36ceb3..d1fa581 100644
--- a/ril/libril/ril_service.cpp
+++ b/ril/libril/ril_service.cpp
@@ -1941,6 +1941,13 @@
             return Void();
         }
 
+#ifdef NEEDS_ROAMING_PROTOCOL_FIELD
+        if (!copyHidlStringToRil(&iaa.roamingProtocol, dataProfileInfo.roamingProtocol, pRI)) {
+            memsetAndFreeStrings(4, iaa.apn, iaa.protocol, iaa.username, iaa.roamingProtocol);
+            return Void();
+        }
+#endif
+
         CALL_ONREQUEST(RIL_REQUEST_SET_INITIAL_ATTACH_APN, &iaa, sizeof(iaa), pRI, mSlotId);
 
         memsetAndFreeStrings(4, iaa.apn, iaa.protocol, iaa.username, iaa.password);