Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d26f4c92 authored by Christopher N. Hesse's avatar Christopher N. Hesse
Browse files

ril: service: Fix breakage introduced by f7c75aa4 

Before:
    if (response == NULL || numStrings != 3) {
After:
    if (response == NULL || numStrings != mqanelements - 2) {

This patch fixes the logic so we don't change the value check.

"mqanelements" is not related to getOperatorResponse, so get get rid of
the affected code.

Change-Id: I86c6ae7b7492a5d04fbc8dc415c4f615e7d05bab
parent 719630aa

ril/libril/ril_service.cpp

+2 −6
Original line number Diff line number Diff line
@@ -3712,10 +3712,6 @@ int radio::getOperatorResponse(int slotId, 
#if VDBG

    RLOGD("getOperatorResponse: serial %d", serial);

#endif

    int mqanelements;

    char value[PROPERTY_VALUE_MAX];

    property_get("ro.ril.telephony.mqanelements", value, "4");

    mqanelements = atoi(value);



    if (radioService[slotId]->mRadioResponse != NULL) {

        RadioResponseInfo responseInfo = {};
@@ -3724,14 +3720,14 @@ int radio::getOperatorResponse(int slotId, 
        hidl_string shortName;

        hidl_string numeric;

        int numStrings = responseLen / sizeof(char *);

        if (response == NULL || numStrings != mqanelements - 2) {

        if (response == NULL || numStrings != 3) {

            RLOGE("getOperatorResponse Invalid response: NULL");

            if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;



        } else {

            char **resp = (char **) response;

            longName = convertCharPtrToHidlString(resp[0]);

            shortName = convertCharPtrToHidlString(resp[0]);

            shortName = convertCharPtrToHidlString(resp[1]);

            numeric = convertCharPtrToHidlString(resp[2]);

        }

        Return<void> retStatus = radioService[slotId]->mRadioResponse->getOperatorResponse(