lineage/android_device_samsung_msm8974-common
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

msm8974-common: libril: Fix network operator search

Browse Source 
* For search, the number of strings returned for
  RIL_REQUEST_QUERY_AVAILABLE_NETWORKS should be defined in the system
  prop ro.ril.telephony.qan_resp_strings

Change-Id: Ie5bb8ba80c5ac93b7502da3b1bb3d2b4404ecd5e
This commit is contained in:
Martin Bouchet 2017-09-24 04:51:55 -03:00 committed by Kevin F. Haggerty
parent 8c30fb5d12
commit e384dfb0f8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ril/libril/ril_service.cpp
View File

@ -30,6 +30,7 @@
#include <hidl/HidlTransportSupport.h> #include <hidl/HidlTransportSupport.h>
#include <utils/SystemClock.h> #include <utils/SystemClock.h>
#include <inttypes.h> #include <inttypes.h>
#include <cutils/properties.h>
#define INVALID_HEX_CHAR 16 #define INVALID_HEX_CHAR 16
@ -4546,20 +4547,21 @@ int radio::getAvailableNetworksResponse(int slotId,
#if VDBG #if VDBG
RLOGD("getAvailableNetworksResponse: serial %d", serial); RLOGD("getAvailableNetworksResponse: serial %d", serial);
#endif #endif
int qanRespStrings = property_get_int32("ro.ril.telephony.qan_resp_strings", 4);
if (radioService[slotId]->mRadioResponse != NULL) { if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {}; RadioResponseInfo responseInfo = {};
populateResponseInfo(responseInfo, serial, responseType, e); populateResponseInfo(responseInfo, serial, responseType, e);
hidl_vec<OperatorInfo> networks; hidl_vec<OperatorInfo> networks;
if ((response == NULL && responseLen != 0) if ((response == NULL && responseLen != 0)
|| responseLen % (4 * sizeof(char *))!= 0) { || responseLen % (qanRespStrings * sizeof(char *))!= 0) {
RLOGE("getAvailableNetworksResponse Invalid response: NULL"); RLOGE("getAvailableNetworksResponse Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE; if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
} else { } else {
char **resp = (char **) response; char **resp = (char **) response;
int numStrings = responseLen / sizeof(char *); int numStrings = responseLen / sizeof(char *);
networks.resize(numStrings/4); networks.resize(numStrings/qanRespStrings);
for (int i = 0, j = 0; i < numStrings; i = i + 4, j++) { for (int i = 0, j = 0; i < numStrings; i = i + qanRespStrings, j++) {
networks[j].alphaLong = convertCharPtrToHidlString(resp[i]); networks[j].alphaLong = convertCharPtrToHidlString(resp[i]);
networks[j].alphaShort = convertCharPtrToHidlString(resp[i + 1]); networks[j].alphaShort = convertCharPtrToHidlString(resp[i + 1]);
networks[j].operatorNumeric = convertCharPtrToHidlString(resp[i + 2]); networks[j].operatorNumeric = convertCharPtrToHidlString(resp[i + 2]);