commit 0688f9eb036c6a529d8ca45da480afb5931f18fd
author Meng Wang <mewan@google.com> Fri Apr 28 22:43:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 28 22:43:38 2017 +0000
tree ab05c358198229b820a330e6507dd498070be64f
parent 2a6951e07f3e6fcf1ce5b4e87f4be9fb31d6694b
parent cbfb65f7cc52f2d18213c585b6829e142e324fc8

Merge "Do not treat NULL response as error for getAllowedCarriers" am: e1bdb3ff16 am: 2579380c88
am: cbfb65f7cc

Change-Id: Ic1fe6f3c559b26f26f3aa9335a04836be969abff

libril/ril_service.cpp

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;