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

Commit d4e03014 authored by Daniel Hillenbrand's avatar Daniel Hillenbrand Committed by build01@build01
Browse files

samsung: libril: some code cleanup 

Change-Id: Ie79369fce7d6c8832c3256c402a485090c177e61
parent 702fdc77

ril/xmm6260/libril/ril.cpp

+11 −3
Original line number Diff line number Diff line
@@ -632,7 +632,6 @@ dispatchDial (Parcel &p, RequestInfo *pRI) { 
    }



    if (s_callbacks.version < 3) { // Remove when partners upgrade to version 3

        ALOGE("dispatchDial: s_callbacks.version < 3");

        uusPresent = 0;

        sizeOfDial = sizeof(dial) - sizeof(RIL_UUS_Info *);

    } else {
@@ -1518,8 +1517,17 @@ static int responseCallList(Parcel &p, void *response, size_t responselen) { 
        p.writeInt32(p_cur->numberPresentation);

        writeStringToParcel(p, p_cur->name);

        p.writeInt32(p_cur->namePresentation);

        // Remove when partners upgrade to version 3

        if ((s_callbacks.version < 3) || (p_cur->uusInfo == NULL || p_cur->uusInfo->uusData == NULL)) {

            p.writeInt32(0); /* UUS Information is absent */



        } else {

            RIL_UUS_Info *uusInfo = p_cur->uusInfo;

            p.writeInt32(1); /* UUS Information is present */

            p.writeInt32(uusInfo->uusType);

            p.writeInt32(uusInfo->uusDcs);

            p.writeInt32(uusInfo->uusLength);

            p.write(uusInfo->uusData, uusInfo->uusLength);

        }

        appendPrintBuf("%s[id=%d,%s,toa=%d,",

            printBuf,

            p_cur->index,

ril/xmm6262/libril/ril.cpp

+57 −63
Original line number Diff line number Diff line
@@ -1037,7 +1037,6 @@ dispatchGsmBrSmsCnf(Parcel &p, RequestInfo *pRI) { 
        goto invalid;

    }



    {

    RIL_GSM_BroadcastSmsConfigInfo gsmBci[num];

    RIL_GSM_BroadcastSmsConfigInfo *gsmBciPtrs[num];
@@ -1081,7 +1080,6 @@ dispatchGsmBrSmsCnf(Parcel &p, RequestInfo *pRI) { 
    memset(gsmBci, 0, num * sizeof(RIL_GSM_BroadcastSmsConfigInfo));

    memset(gsmBciPtrs, 0, num * sizeof(RIL_GSM_BroadcastSmsConfigInfo *));

#endif

    }



    return;
@@ -1101,7 +1099,6 @@ dispatchCdmaBrSmsCnf(Parcel &p, RequestInfo *pRI) { 
        goto invalid;

    }



    {

    RIL_CDMA_BroadcastSmsConfigInfo cdmaBci[num];

    RIL_CDMA_BroadcastSmsConfigInfo *cdmaBciPtrs[num];
@@ -1137,7 +1134,6 @@ dispatchCdmaBrSmsCnf(Parcel &p, RequestInfo *pRI) { 
    memset(cdmaBci, 0, num * sizeof(RIL_CDMA_BroadcastSmsConfigInfo));

    memset(cdmaBciPtrs, 0, num * sizeof(RIL_CDMA_BroadcastSmsConfigInfo *));

#endif

    }



    return;
@@ -2360,8 +2356,6 @@ static void sendSimStatusAppInfo(Parcel &p, int num_apps, RIL_AppStatus appStatu 
}



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

    int i;



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

        ALOGE("invalid response: NULL");

        return RIL_ERRNO_INVALID_RESPONSE;