ril: Add support for roamingProtocol parcel member

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

Change-Id: I549130b838377d8a8668ac59b51c314fe9e7f5ab
tirimbino
Christopher N. Hesse 7 years ago
parent c41b85cf57
commit ffe632e356
  1. 4
      ril/libril/Android.mk
  2. 7
      ril/libril/ril_service.cpp

@ -50,6 +50,10 @@ ifeq ($(BOARD_MODEM_NEEDS_VIDEO_CALL_FIELD), true)
LOCAL_CFLAGS += -DNEEDS_VIDEO_CALL_FIELD LOCAL_CFLAGS += -DNEEDS_VIDEO_CALL_FIELD
endif endif
ifeq ($(BOARD_NEEDS_ROAMING_PROTOCOL_FIELD), true)
LOCAL_CFLAGS += -DNEEDS_ROAMING_PROTOCOL_FIELD
endif
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
LOCAL_C_INCLUDES += external/nanopb-c LOCAL_C_INCLUDES += external/nanopb-c
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include

@ -1941,6 +1941,13 @@ Return<void> RadioImpl::setInitialAttachApn(int32_t serial, const DataProfileInf
return Void(); 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); CALL_ONREQUEST(RIL_REQUEST_SET_INITIAL_ATTACH_APN, &iaa, sizeof(iaa), pRI, mSlotId);
memsetAndFreeStrings(4, iaa.apn, iaa.protocol, iaa.username, iaa.password); memsetAndFreeStrings(4, iaa.apn, iaa.protocol, iaa.username, iaa.password);

Loading…
Cancel
Save