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

Commit 9240572c authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Parse response from hal even in case of error. 

Test: manual sim pin testing, basic telephony sanity
Bug: 37941868
Change-Id: I1a0b576c84ebb9bf4ac3de41538d148a1a043c05
parent d17f611f

src/java/com/android/internal/telephony/RadioResponse.java

+216 −244
Original line number Original line Diff line number Diff line
@@ -1090,11 +1090,9 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            RadioCapability ret = null;

            RadioCapability ret = RIL.convertHalRadioCapability(rc, mRil);

            if (responseInfo.error == RadioError.NONE) {

            if (responseInfo.error == RadioError.REQUEST_NOT_SUPPORTED

                ret = RIL.convertHalRadioCapability(rc, mRil);

                    || responseInfo.error == RadioError.GENERIC_FAILURE) {

            } else if (responseInfo.error == RadioError.REQUEST_NOT_SUPPORTED ||

                    responseInfo.error == RadioError.GENERIC_FAILURE) {

                // we should construct the RAF bitmask the radio

                // we should construct the RAF bitmask the radio

                // supports based on preferred network bitmasks

                // supports based on preferred network bitmasks

                ret = mRil.makeStaticRadioCapability();

                ret = mRil.makeStaticRadioCapability();
@@ -1192,8 +1190,6 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            Object ret = null;

            if (responseInfo.error == RadioError.NONE) {

            IccCardStatus iccCardStatus = new IccCardStatus();

            IccCardStatus iccCardStatus = new IccCardStatus();

            iccCardStatus.setCardState(cardStatus.cardState);

            iccCardStatus.setCardState(cardStatus.cardState);

            iccCardStatus.setUniversalPinState(cardStatus.universalPinState);

            iccCardStatus.setUniversalPinState(cardStatus.universalPinState);
@@ -1224,10 +1220,10 @@ public class RadioResponse extends IRadioResponse.Stub { 
                iccCardStatus.mApplications[i] = appStatus;

                iccCardStatus.mApplications[i] = appStatus;

            }

            }

            mRil.riljLog("responseIccCardStatus: from HIDL: " + iccCardStatus);

            mRil.riljLog("responseIccCardStatus: from HIDL: " + iccCardStatus);

                ret = iccCardStatus;

            if (responseInfo.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, iccCardStatus);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, iccCardStatus);

        }

        }

    }

    }
@@ -1243,13 +1239,11 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            Object ret = null;

            int[] ret = new int[var.size()];

            if (responseInfo.error == RadioError.NONE) {

                int[] response = new int[var.size()];

            for (int i = 0; i < var.size(); i++) {

            for (int i = 0; i < var.size(); i++) {

                    response[i] = var.get(i);

                ret[i] = var.get(i);

            }

            }

                ret = response;

            if (responseInfo.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, ret);
@@ -1261,15 +1255,10 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            Object ret = null;

            int num = calls.size();

            if (responseInfo.error == RadioError.NONE) {

            ArrayList<DriverCall> dcCalls = new ArrayList<DriverCall>(num);

                int num;

                ArrayList<DriverCall> dcCalls;

            DriverCall dc;

            DriverCall dc;





                num = calls.size();

                dcCalls = new ArrayList<DriverCall>(num);



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

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

                dc = new DriverCall();

                dc = new DriverCall();

                // TODO: change name of function stateFromCLCC() in DriverCall.java to name

                // TODO: change name of function stateFromCLCC() in DriverCall.java to name
@@ -1333,10 +1322,10 @@ public class RadioResponse extends IRadioResponse.Stub { 
                }

                }

            }

            }





                ret = dcCalls;

            if (responseInfo.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, dcCalls);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, dcCalls);

        }

        }

    }

    }
@@ -1356,12 +1345,10 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            String ret = null;

            if (responseInfo.error == RadioError.NONE) {

            if (responseInfo.error == RadioError.NONE) {

                ret = str;

                sendMessageResponse(rr.mResult, str);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, str);

        }

        }

    }

    }
@@ -1378,12 +1365,11 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = ril.processResponse(responseInfo);

        RILRequest rr = ril.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            String[] ret = null;

            String[] ret = new String[strings.size()];

            if (responseInfo.error == RadioError.NONE) {

                ret = new String[strings.size()];

            for (int i = 0; i < strings.size(); i++) {

            for (int i = 0; i < strings.size(); i++) {

                ret[i] = strings.get(i);

                ret[i] = strings.get(i);

            }

            }

            if (responseInfo.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            ril.processResponseDone(rr, responseInfo, ret);

            ril.processResponseDone(rr, responseInfo, ret);
@@ -1395,11 +1381,10 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            LastCallFailCause ret = null;

            LastCallFailCause ret = new LastCallFailCause();

            if (responseInfo.error == RadioError.NONE) {

                ret = new LastCallFailCause();

            ret.causeCode = fcInfo.causeCode;

            ret.causeCode = fcInfo.causeCode;

            ret.vendorCause = fcInfo.vendorCause;

            ret.vendorCause = fcInfo.vendorCause;

            if (responseInfo.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, ret);
@@ -1411,9 +1396,8 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            SignalStrength ret = null;

            SignalStrength ret = RIL.convertHalSignalStrength(sigStrength);

            if (responseInfo.error == RadioError.NONE) {

            if (responseInfo.error == RadioError.NONE) {

                ret = RIL.convertHalSignalStrength(sigStrength);

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, ret);
@@ -1424,9 +1408,8 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            SmsResponse ret = null;

            SmsResponse ret = new SmsResponse(sms.messageRef, sms.ackPDU, sms.errorCode);

            if (responseInfo.error == RadioError.NONE) {

            if (responseInfo.error == RadioError.NONE) {

                ret = new SmsResponse(sms.messageRef, sms.ackPDU, sms.errorCode);

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, ret);
@@ -1451,9 +1434,8 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            IccIoResult ret = null;

            IccIoResult ret = new IccIoResult(result.sw1, result.sw2, result.simResponse);

            if (responseInfo.error == RadioError.NONE) {

            if (responseInfo.error == RadioError.NONE) {

                ret = new IccIoResult(result.sw1, result.sw2, result.simResponse);

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, ret);
@@ -1465,9 +1447,7 @@ public class RadioResponse extends IRadioResponse.Stub { 
                                                 callForwardInfos) {

                                                 callForwardInfos) {

        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);

        if (rr != null) {

        if (rr != null) {

            CallForwardInfo[] ret = null;

            CallForwardInfo[] ret = new CallForwardInfo[callForwardInfos.size()];

            if (responseInfo.error == RadioError.NONE) {

                ret = new CallForwardInfo[callForwardInfos.size()];

            for (int i = 0; i < callForwardInfos.size(); i++) {

            for (int i = 0; i < callForwardInfos.size(); i++) {

                ret[i] = new CallForwardInfo();

                ret[i] = new CallForwardInfo();

                ret[i].status = callForwardInfos.get(i).status;

                ret[i].status = callForwardInfos.get(i).status;
@@ -1477,6 +1457,7 @@ public class RadioResponse extends IRadioResponse.Stub { 
                ret[i].number = callForwardInfos.get(i).number;

                ret[i].number = callForwardInfos.get(i).number;

                ret[i].timeSeconds = callForwardInfos.get(i).timeSeconds;

                ret[i].timeSeconds = callForwardInfos.get(i).timeSeconds;

            }

            }

            if (responseInfo.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, ret);
@@ -1503,14 +1484,13 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            ArrayList<OperatorInfo> ret = null;

            ArrayList<OperatorInfo> ret = new ArrayList<OperatorInfo>();

            if (responseInfo.error == RadioError.NONE) {

                ret =  new ArrayList<OperatorInfo>();

            for (int i = 0; i < networkInfos.size(); i++) {

            for (int i = 0; i < networkInfos.size(); i++) {

                ret.add(new OperatorInfo(networkInfos.get(i).alphaLong,

                ret.add(new OperatorInfo(networkInfos.get(i).alphaLong,

                        networkInfos.get(i).alphaShort, networkInfos.get(i).operatorNumeric,

                        networkInfos.get(i).alphaShort, networkInfos.get(i).operatorNumeric,

                        convertOpertatorInfoToString(networkInfos.get(i).status)));

                        convertOpertatorInfoToString(networkInfos.get(i).status)));

            }

            }

            if (responseInfo.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, ret);
@@ -1522,12 +1502,11 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            ArrayList<DataCallResponse> dcResponseList = null;

            ArrayList<DataCallResponse> dcResponseList = new ArrayList<>();

            if (responseInfo.error == RadioError.NONE) {

                dcResponseList = new ArrayList<>();

            for (SetupDataCallResult dcResult : dataCallResultList) {

            for (SetupDataCallResult dcResult : dataCallResultList) {

                dcResponseList.add(RIL.convertDataCallResult(dcResult));

                dcResponseList.add(RIL.convertDataCallResult(dcResult));

            }

            }

            if (responseInfo.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, dcResponseList);

                sendMessageResponse(rr.mResult, dcResponseList);

            }

            }

            mRil.processResponseDone(rr, responseInfo, dcResponseList);

            mRil.processResponseDone(rr, responseInfo, dcResponseList);
@@ -1541,12 +1520,9 @@ public class RadioResponse extends IRadioResponse.Stub { 
        if (rr != null) {

        if (rr != null) {

            int rssi;

            int rssi;

            String location;

            String location;

            ArrayList<NeighboringCellInfo> ret = null;

            ArrayList<NeighboringCellInfo> ret = new ArrayList<NeighboringCellInfo>();

            NeighboringCellInfo cell;

            NeighboringCellInfo cell;





            if (responseInfo.error == RadioError.NONE) {

                ret =  new ArrayList<NeighboringCellInfo>();



            int[] subId = SubscriptionManager.getSubId(mRil.mPhoneId);

            int[] subId = SubscriptionManager.getSubId(mRil.mPhoneId);

            int radioType =

            int radioType =

                    ((TelephonyManager) mRil.mContext.getSystemService(

                    ((TelephonyManager) mRil.mContext.getSystemService(
@@ -1560,6 +1536,7 @@ public class RadioResponse extends IRadioResponse.Stub { 
                    ret.add(cell);

                    ret.add(cell);

                }

                }

            }

            }

            if (responseInfo.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, ret);
@@ -1571,14 +1548,13 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            ArrayList<SmsBroadcastConfigInfo> ret = null;

            ArrayList<SmsBroadcastConfigInfo> ret = new ArrayList<SmsBroadcastConfigInfo>();

            if (responseInfo.error == RadioError.NONE) {

                ret =  new ArrayList<SmsBroadcastConfigInfo>();

            for (int i = 0; i < configs.size(); i++) {

            for (int i = 0; i < configs.size(); i++) {

                ret.add(new SmsBroadcastConfigInfo(configs.get(i).fromServiceId,

                ret.add(new SmsBroadcastConfigInfo(configs.get(i).fromServiceId,

                        configs.get(i).toServiceId, configs.get(i).fromCodeScheme,

                        configs.get(i).toServiceId, configs.get(i).fromCodeScheme,

                        configs.get(i).toCodeScheme, configs.get(i).selected));

                        configs.get(i).toCodeScheme, configs.get(i).selected));

            }

            }

            if (responseInfo.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, ret);
@@ -1592,7 +1568,6 @@ public class RadioResponse extends IRadioResponse.Stub { 
        if (rr != null) {

        if (rr != null) {

            int[] ret = null;

            int[] ret = null;





            if (responseInfo.error == RadioError.NONE) {

            int numServiceCategories = configs.size();

            int numServiceCategories = configs.size();





            if (numServiceCategories == 0) {

            if (numServiceCategories == 0) {
@@ -1627,6 +1602,7 @@ public class RadioResponse extends IRadioResponse.Stub { 
                    ret[i + 2] = configs.get(j).selected ? 1 : 0;

                    ret[i + 2] = configs.get(j).selected ? 1 : 0;

                }

                }

            }

            }

            if (responseInfo.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, ret);
@@ -1638,9 +1614,8 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            ArrayList<CellInfo> ret = null;

            ArrayList<CellInfo> ret = RIL.convertHalCellInfoList(cellInfo);

            if (responseInfo.error == RadioError.NONE) {

            if (responseInfo.error == RadioError.NONE) {

                ret =  RIL.convertHalCellInfoList(cellInfo);

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, ret);
@@ -1679,9 +1654,8 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            ArrayList<HardwareConfig> ret = null;

            ArrayList<HardwareConfig> ret = RIL.convertHalHwConfigList(config, mRil);

            if (responseInfo.error == RadioError.NONE) {

            if (responseInfo.error == RadioError.NONE) {

                ret = RIL.convertHalHwConfigList(config, mRil);

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, ret);
@@ -1693,11 +1667,13 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            IccIoResult ret = null;

            IccIoResult ret = new IccIoResult(

            if (responseInfo.error == RadioError.NONE) {

                    result.sw1,

                ret = new IccIoResult(result.sw1, result.sw2, (!(result.simResponse).equals(""))

                    result.sw2,

                    (!(result.simResponse).equals(""))

                            ? android.util.Base64.decode(result.simResponse,

                            ? android.util.Base64.decode(result.simResponse,

                            android.util.Base64.DEFAULT) : (byte[]) null);

                            android.util.Base64.DEFAULT) : (byte[]) null);

            if (responseInfo.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, ret);
@@ -1709,9 +1685,8 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            RadioCapability ret = null;

            RadioCapability ret = RIL.convertHalRadioCapability(rc, mRil);

            if (responseInfo.error == RadioError.NONE) {

            if (responseInfo.error == RadioError.NONE) {

                ret = RIL.convertHalRadioCapability(rc, mRil);

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, ret);
@@ -1722,11 +1697,10 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            ArrayList<Integer> ret = null;

            ArrayList<Integer> ret = new ArrayList<Integer>();

            if (responseInfo.error == RadioError.NONE) {

                ret = new ArrayList<Integer>();

            ret.add(statusInfo.lceStatus);

            ret.add(statusInfo.lceStatus);

            ret.add((int) statusInfo.actualIntervalMs);

            ret.add((int) statusInfo.actualIntervalMs);

            if (responseInfo.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, ret);
@@ -1737,9 +1711,8 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            ArrayList<Integer> ret = null;

            ArrayList<Integer> ret = RIL.convertHalLceData(lceInfo, mRil);

            if (responseInfo.error == RadioError.NONE) {

            if (responseInfo.error == RadioError.NONE) {

                ret = RIL.convertHalLceData(lceInfo, mRil);

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }

            mRil.processResponseDone(rr, responseInfo, ret);

            mRil.processResponseDone(rr, responseInfo, ret);
@@ -1751,9 +1724,7 @@ public class RadioResponse extends IRadioResponse.Stub { 
        RILRequest rr = mRil.processResponse(responseInfo);

        RILRequest rr = mRil.processResponse(responseInfo);





        if (rr != null) {

        if (rr != null) {

            List<CarrierIdentifier> ret = null;

            List<CarrierIdentifier> ret = new ArrayList<CarrierIdentifier>();

            if (responseInfo.error == RadioError.NONE) {

                ret = new ArrayList<CarrierIdentifier>();

            for (int i = 0; i < carriers.allowedCarriers.size(); i++) {

            for (int i = 0; i < carriers.allowedCarriers.size(); i++) {

                String mcc = carriers.allowedCarriers.get(i).mcc;

                String mcc = carriers.allowedCarriers.get(i).mcc;

                String mnc = carriers.allowedCarriers.get(i).mnc;

                String mnc = carriers.allowedCarriers.get(i).mnc;
@@ -1771,6 +1742,7 @@ public class RadioResponse extends IRadioResponse.Stub { 
                }

                }

                ret.add(new CarrierIdentifier(mcc, mnc, spn, imsi, gid1, gid2));

                ret.add(new CarrierIdentifier(mcc, mnc, spn, imsi, gid1, gid2));

            }

            }

            if (responseInfo.error == RadioError.NONE) {

                /* TODO: Handle excluded carriers */

                /* TODO: Handle excluded carriers */

                sendMessageResponse(rr.mResult, ret);

                sendMessageResponse(rr.mResult, ret);

            }

            }