Merge "Do not treat NULL response as error for getAllowedCarriers" am: e1bdb3ff16 am: 2579380c88
am: cbfb65f7cc
Change-Id: Ic1fe6f3c559b26f26f3aa9335a04836be969abff
diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index cb28e71..b71f83a 100644
--- a/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@ -6186,8 +6186,14 @@
populateResponseInfo(responseInfo, serial, responseType, e);
CarrierRestrictions carrierInfo = {};
bool allAllowed = true;
- if (response == NULL || responseLen != sizeof(RIL_CarrierRestrictions)) {
- RLOGE("getAllowedCarriersResponse Invalid response: NULL");
+ if (response == NULL) {
+#if VDBG
+ RLOGD("getAllowedCarriersResponse response is NULL: all allowed");
+#endif
+ carrierInfo.allowedCarriers.resize(0);
+ carrierInfo.excludedCarriers.resize(0);
+ } else if (responseLen != sizeof(RIL_CarrierRestrictions)) {
+ RLOGE("getAllowedCarriersResponse Invalid response");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else {
RIL_CarrierRestrictions *pCr = (RIL_CarrierRestrictions *)response;