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

Commit f8135359 authored by Daniel Hillenbrand's avatar Daniel Hillenbrand Committed by Nir Bruderman
Browse files

libril: rewrite preferred network type 

NETWORK_MODE_GLOBAL => NETWORK_MODE_WCDMA_PREF

Change-Id: I3087e4be3a6ff700b39544279fa0e265b9182180
(cherry picked from commit d0b84165)
parent 558ff593

ril/libril/ril.cpp

+36 −5
Original line number Diff line number Diff line
@@ -280,8 +280,8 @@ static void dispatchUiccSubscripton(Parcel &p, RequestInfo *pRI); 
static void dispatchSimAuthentication(Parcel &p, RequestInfo *pRI);

static void dispatchDataProfile(Parcel &p, RequestInfo *pRI);

static int responseInts(Parcel &p, void *response, size_t responselen);

static int responseIntsGetPreferredNetworkType(Parcel &p, void *response, size_t responselen);

static int responseStrings(Parcel &p, void *response, size_t responselen);

static int responseStringsNetworks(Parcel &p, void *response, size_t responselen);

static int responseStrings(Parcel &p, void *response, size_t responselen, bool network_search);

static int responseString(Parcel &p, void *response, size_t responselen);

static int responseVoid(Parcel &p, void *response, size_t responselen);
@@ -2124,6 +2124,41 @@ responseInts(Parcel &p, void *response, size_t responselen) { 
    return 0;

}



static int

responseIntsGetPreferredNetworkType(Parcel &p, void *response, size_t responselen) {

    int numInts;



    if (response == NULL && responselen != 0) {

        RLOGE("invalid response: NULL");

        return RIL_ERRNO_INVALID_RESPONSE;

    }

    if (responselen % sizeof(int) != 0) {

        RLOGE("responseInts: invalid response length %d expected multiple of %d\n",

            (int)responselen, (int)sizeof(int));

        return RIL_ERRNO_INVALID_RESPONSE;

    }



    int *p_int = (int *) response;



    numInts = responselen / sizeof(int);

    p.writeInt32 (numInts);



    /* each int*/

    startResponse;

    for (int i = 0 ; i < numInts ; i++) {

        if (i == 0 && p_int[0] == 7) {

            RLOGD("REQUEST_GET_PREFERRED_NETWORK_TYPE: NETWORK_MODE_GLOBAL => NETWORK_MODE_WCDMA_PREF");

            p_int[0] = 0;

        }

        appendPrintBuf("%s%d,", printBuf, p_int[i]);

        p.writeInt32(p_int[i]);

    }

    removeLastChar;

    closeResponse;



    return 0;

}



/** response is a char **, pointing to an array of char *'s

    The parcel will begin with the version */

static int responseStringsWithVersion(int version, Parcel &p, void *response, size_t responselen) {
@@ -2136,10 +2171,6 @@ static int responseStrings(Parcel &p, void *response, size_t responselen) { 
    return responseStrings(p, response, responselen, false);

}



static int responseStringsNetworks(Parcel &p, void *response, size_t responselen) {

    return responseStrings(p, response, responselen, true);

}



/** response is a char **, pointing to an array of char *'s */

static int responseStrings(Parcel &p, void *response, size_t responselen, bool network_search) {

    int numStrings;

ril/libril/ril_commands.h

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
    {RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE, dispatchVoid, responseInts},

    {RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC, dispatchVoid, responseVoid},

    {RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL, dispatchString, responseVoid},

    {RIL_REQUEST_QUERY_AVAILABLE_NETWORKS , dispatchVoid, responseStringsNetworks},

    {RIL_REQUEST_QUERY_AVAILABLE_NETWORKS , dispatchVoid, responseStrings},

    {RIL_REQUEST_DTMF_START, dispatchString, responseVoid},

    {RIL_REQUEST_DTMF_STOP, dispatchVoid, responseVoid},

    {RIL_REQUEST_BASEBAND_VERSION, dispatchVoid, responseString},
@@ -88,7 +88,7 @@ 
    {RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM, dispatchInts, responseVoid},

    {RIL_REQUEST_EXPLICIT_CALL_TRANSFER, dispatchVoid, responseVoid},

    {RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE, dispatchInts, responseVoid},

    {RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE, dispatchVoid, responseInts},

    {RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE, dispatchVoid, responseIntsGetPreferredNetworkType},

    {RIL_REQUEST_GET_NEIGHBORING_CELL_IDS, dispatchVoid, responseCellList},

    {RIL_REQUEST_SET_LOCATION_UPDATES, dispatchInts, responseVoid},

    {RIL_REQUEST_CDMA_SET_SUBSCRIPTION_SOURCE, dispatchInts, responseVoid},