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

Commit 6d826486 authored by Shareef Ali's avatar Shareef Ali Committed by Ricardo Cerqueira
Browse files

SamsungQualcommRIL: fix errors and replaces it with known values 

* handles all exception and errors coming from the ril.
* fix an issue with mnc, potentially fixing herpderpd/lte  daemon.
* properly fix all exceptions
* We only need AMR states, cyanogen said
* clean up legacy stuff

Change-Id: If76e0c995b1d95e155fc2fe724de1f12013125c3
parent 135d8ff7

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

+264 −31
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ public class SamsungQualcommRIL extends RIL implements CommandsInterface { 
    private boolean mIsSendingSMS = false;

    private boolean isGSM = false;

    public static final long SEND_SMS_TIMEOUT_IN_MS = 30000;



    private String homeOperator= SystemProperties.get("ro.cdma.home.operator.numeric");

    private String operator= SystemProperties.get("ro.cdma.home.operator.alpha");

    public SamsungQualcommRIL(Context context, int networkMode,

            int cdmaSubscription) {

        super(context, networkMode, cdmaSubscription);
@@ -89,20 +90,9 @@ public class SamsungQualcommRIL extends RIL implements CommandsInterface { 


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

            appStatus = new IccCardApplicationStatus();







            appStatus.app_type       = appStatus.AppTypeFromRILInt(p.readInt());

            appStatus.app_state      = appStatus.AppStateFromRILInt(p.readInt());

            appStatus.perso_substate = appStatus.PersoSubstateFromRILInt(p.readInt());

            if ((appStatus.app_state == IccCardApplicationStatus.AppState.APPSTATE_SUBSCRIPTION_PERSO) &&

                ((appStatus.perso_substate == IccCardApplicationStatus.PersoSubState.PERSOSUBSTATE_READY) ||

                 (appStatus.perso_substate == IccCardApplicationStatus.PersoSubState.PERSOSUBSTATE_UNKNOWN))) {

                    // ridiculous hack for network SIM unlock pin

                    appStatus.app_state = IccCardApplicationStatus.AppState.APPSTATE_UNKNOWN;

                    Log.d(LOG_TAG, "ca.app_state == AppState.APPSTATE_SUBSCRIPTION_PERSO");

                    Log.d(LOG_TAG, "ca.perso_substate == PersoSubState.PERSOSUBSTATE_READY");

                }

            appStatus.aid            = p.readString();

            appStatus.app_label      = p.readString();

            appStatus.pin1_replaced  = p.readInt();
@@ -214,7 +204,6 @@ public class SamsungQualcommRIL extends RIL implements CommandsInterface { 
        int dataPosition = p.dataPosition(); // save off position within the Parcel

        int response = p.readInt();





        switch(response) {

            case RIL_UNSOL_RIL_CONNECTED: // Fix for NV/RUIM setting on CDMA SIM devices

                // skip getcdmascriptionsource as if qualcomm handles it in the ril binary
@@ -226,11 +215,9 @@ public class SamsungQualcommRIL extends RIL implements CommandsInterface { 
            case RIL_UNSOL_NITZ_TIME_RECEIVED:

                handleNitzTimeReceived(p);

                break;



            // SAMSUNG STATES

            case SamsungExynos4RIL.RIL_UNSOL_AM:

                ret = responseString(p);

                if (RILJ_LOGD) samsungUnsljLogRet(response, ret);

                String amString = (String) ret;

                Log.d(LOG_TAG, "Executing AM: " + amString);
@@ -241,28 +228,16 @@ public class SamsungQualcommRIL extends RIL implements CommandsInterface { 
                    Log.e(LOG_TAG, "am " + amString + " could not be executed.");

                }

                break;

            case SamsungExynos4RIL.RIL_UNSOL_DUN_PIN_CONTROL_SIGNAL:

            case SamsungExynos4RIL.RIL_UNSOL_RESPONSE_HANDOVER:

                ret = responseVoid(p);

                if (RILJ_LOGD)  samsungUnsljLogRet(response, ret);

                break;

            case SamsungExynos4RIL.RIL_UNSOL_DATA_SUSPEND_RESUME:

                ret = responseInts(p);

                if (RILJ_LOGD) samsungUnsljLogRet(response, ret);

                break;

            case SamsungExynos4RIL.RIL_UNSOL_STK_CALL_CONTROL_RESULT:

            case 1036:

                ret = responseVoid(p);

                if (RILJ_LOGD) samsungUnsljLogRet(response, ret);

                break;

            case SamsungExynos4RIL.RIL_UNSOL_TWO_MIC_STATE:

                ret = responseInts(p);

                if (RILJ_LOGD) samsungUnsljLogRet(response, ret);

                break;

            case SamsungExynos4RIL.RIL_UNSOL_WB_AMR_STATE:

                ret = responseInts(p);

                if (RILJ_LOGD) samsungUnsljLogRet(response, ret);

                setWbAmr(((int[])ret)[0]);

                break;



            default:

                // Rewind the Parcel

                p.setDataPosition(dataPosition);
@@ -274,14 +249,272 @@ public class SamsungQualcommRIL extends RIL implements CommandsInterface { 


    }



    protected void samsungUnsljLogRet(int response, Object ret) {

        riljLog("[UNSL]< " + SamsungExynos4RIL.samsungResponseToString(response) + " " + retToString(response, ret));

    @Override

    protected void

    processSolicited (Parcel p) {

        if (isGSM){

            super.processSolicited(p);

            return;

        }

        int serial, error;

        boolean found = false;



        serial = p.readInt();

        error = p.readInt();



        RILRequest rr;



        rr = findAndRemoveRequestFromList(serial);



        if (rr == null) {

            Log.w(LOG_TAG, "Unexpected solicited response! sn: "

                            + serial + " error: " + error);

            return;

        }



        Object ret = null;



        if (error == 0 || p.dataAvail() > 0) {

            // either command succeeds or command fails but with data payload

            try {switch (rr.mRequest) {

            /*

 cat libs/telephony/ril_commands.h \

 | egrep "^ *{RIL_" \

 | sed -re 's/\{([^,]+),[^,]+,([^}]+).+/case \1: ret = \2(p); break;/'

             */

            case RIL_REQUEST_GET_SIM_STATUS: ret =  responseIccCardStatus(p); break;

            case RIL_REQUEST_ENTER_SIM_PIN: ret =  responseInts(p); break;

            case RIL_REQUEST_ENTER_SIM_PUK: ret =  responseInts(p); break;

            case RIL_REQUEST_ENTER_SIM_PIN2: ret =  responseInts(p); break;

            case RIL_REQUEST_ENTER_SIM_PUK2: ret =  responseInts(p); break;

            case RIL_REQUEST_CHANGE_SIM_PIN: ret =  responseInts(p); break;

            case RIL_REQUEST_CHANGE_SIM_PIN2: ret =  responseInts(p); break;

            case RIL_REQUEST_ENTER_NETWORK_DEPERSONALIZATION: ret =  responseInts(p); break;

            case RIL_REQUEST_GET_CURRENT_CALLS: ret =  responseCallList(p); break;

            case RIL_REQUEST_DIAL: ret =  responseVoid(p); break;

            case RIL_REQUEST_GET_IMSI: ret =  responseString(p); break;

            case RIL_REQUEST_HANGUP: ret =  responseVoid(p); break;

            case RIL_REQUEST_HANGUP_WAITING_OR_BACKGROUND: ret =  responseVoid(p); break;

            case RIL_REQUEST_HANGUP_FOREGROUND_RESUME_BACKGROUND: {

                if (mTestingEmergencyCall.getAndSet(false)) {

                    if (mEmergencyCallbackModeRegistrant != null) {

                        riljLog("testing emergency call, notify ECM Registrants");

                        mEmergencyCallbackModeRegistrant.notifyRegistrant();

                    }

                }

                ret =  responseVoid(p);

                break;

            }

            case RIL_REQUEST_SWITCH_WAITING_OR_HOLDING_AND_ACTIVE: ret =  responseVoid(p); break;

            case RIL_REQUEST_CONFERENCE: ret =  responseVoid(p); break;

            case RIL_REQUEST_UDUB: ret =  responseVoid(p); break;

            case RIL_REQUEST_LAST_CALL_FAIL_CAUSE: ret =  responseInts(p); break;

            case RIL_REQUEST_SIGNAL_STRENGTH: ret =  responseSignalStrength(p); break;

                    //modification start

                // prevent exceptions from happenimg because the null value is null or a hexadecimel. so convert if it is not null

            case RIL_REQUEST_VOICE_REGISTRATION_STATE: ret =  responseVoiceDataRegistrationState(p); break;

            case RIL_REQUEST_DATA_REGISTRATION_STATE: ret =  responseVoiceDataRegistrationState(p); break;

                // this fixes bogus values the modem creates

                // sometimes the  ril may print out

                // (always on sprint)

                // sprint: (empty,empty,31000)

                // this problemaic on sprint, lte won't start, response is slow

                //speeds up response time on eherpderpd/lte networks

            case RIL_REQUEST_OPERATOR: ret =  operatorCheck(p); break;

                    //end modification

            case RIL_REQUEST_RADIO_POWER: ret =  responseVoid(p); break;

            case RIL_REQUEST_DTMF: ret =  responseVoid(p); break;

            case RIL_REQUEST_SEND_SMS: ret =  responseSMS(p); break;

            case RIL_REQUEST_SEND_SMS_EXPECT_MORE: ret =  responseSMS(p); break;

            case RIL_REQUEST_SETUP_DATA_CALL: ret =  responseSetupDataCall(p); break;

            case RIL_REQUEST_SIM_IO: ret =  responseICC_IO(p); break;

            case RIL_REQUEST_SEND_USSD: ret =  responseVoid(p); break;

            case RIL_REQUEST_CANCEL_USSD: ret =  responseVoid(p); break;

            case RIL_REQUEST_GET_CLIR: ret =  responseInts(p); break;

            case RIL_REQUEST_SET_CLIR: ret =  responseVoid(p); break;

            case RIL_REQUEST_QUERY_CALL_FORWARD_STATUS: ret =  responseCallForward(p); break;

            case RIL_REQUEST_SET_CALL_FORWARD: ret =  responseVoid(p); break;

            case RIL_REQUEST_QUERY_CALL_WAITING: ret =  responseInts(p); break;

            case RIL_REQUEST_SET_CALL_WAITING: ret =  responseVoid(p); break;

            case RIL_REQUEST_SMS_ACKNOWLEDGE: ret =  responseVoid(p); break;

            case RIL_REQUEST_GET_IMEI: ret =  responseString(p); break;

            case RIL_REQUEST_GET_IMEISV: ret =  responseString(p); break;

            case RIL_REQUEST_ANSWER: ret =  responseVoid(p); break;

            case RIL_REQUEST_DEACTIVATE_DATA_CALL: ret =  responseVoid(p); break;

            case RIL_REQUEST_QUERY_FACILITY_LOCK: ret =  responseInts(p); break;

            case RIL_REQUEST_SET_FACILITY_LOCK: ret =  responseInts(p); break;

            case RIL_REQUEST_CHANGE_BARRING_PASSWORD: ret =  responseVoid(p); break;

            case RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE: ret =  responseInts(p); break;

            case RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC: ret =  responseVoid(p); break;

            case RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL: ret =  responseVoid(p); break;

            case RIL_REQUEST_QUERY_AVAILABLE_NETWORKS : ret =  responseOperatorInfos(p); break;

            case RIL_REQUEST_DTMF_START: ret =  responseVoid(p); break;

            case RIL_REQUEST_DTMF_STOP: ret =  responseVoid(p); break;

            case RIL_REQUEST_BASEBAND_VERSION: ret =  responseString(p); break;

            case RIL_REQUEST_SEPARATE_CONNECTION: ret =  responseVoid(p); break;

            case RIL_REQUEST_SET_MUTE: ret =  responseVoid(p); break;

            case RIL_REQUEST_GET_MUTE: ret =  responseInts(p); break;

            case RIL_REQUEST_QUERY_CLIP: ret =  responseInts(p); break;

            case RIL_REQUEST_LAST_DATA_CALL_FAIL_CAUSE: ret =  responseInts(p); break;

            case RIL_REQUEST_DATA_CALL_LIST: ret =  responseDataCallList(p); break;

            case RIL_REQUEST_RESET_RADIO: ret =  responseVoid(p); break;

            case RIL_REQUEST_OEM_HOOK_RAW: ret =  responseRaw(p); break;

            case RIL_REQUEST_OEM_HOOK_STRINGS: ret =  responseStrings(p); break;

            case RIL_REQUEST_SCREEN_STATE: ret =  responseVoid(p); break;

            case RIL_REQUEST_SET_SUPP_SVC_NOTIFICATION: ret =  responseVoid(p); break;

            case RIL_REQUEST_WRITE_SMS_TO_SIM: ret =  responseInts(p); break;

            case RIL_REQUEST_DELETE_SMS_ON_SIM: ret =  responseVoid(p); break;

            case RIL_REQUEST_SET_BAND_MODE: ret =  responseVoid(p); break;

            case RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE: ret =  responseInts(p); break;

            case RIL_REQUEST_STK_GET_PROFILE: ret =  responseString(p); break;

            case RIL_REQUEST_STK_SET_PROFILE: ret =  responseVoid(p); break;

            case RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND: ret =  responseString(p); break;

            case RIL_REQUEST_STK_SEND_TERMINAL_RESPONSE: ret =  responseVoid(p); break;

            case RIL_REQUEST_STK_HANDLE_CALL_SETUP_REQUESTED_FROM_SIM: ret =  responseInts(p); break;

            case RIL_REQUEST_EXPLICIT_CALL_TRANSFER: ret =  responseVoid(p); break;

            case RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE: ret =  responseVoid(p); break;

            case RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE: ret =  responseGetPreferredNetworkType(p); break;

            case RIL_REQUEST_GET_NEIGHBORING_CELL_IDS: ret = responseCellList(p); break;

            case RIL_REQUEST_SET_LOCATION_UPDATES: ret =  responseVoid(p); break;

            case RIL_REQUEST_CDMA_SET_SUBSCRIPTION_SOURCE: ret =  responseVoid(p); break;

            case RIL_REQUEST_CDMA_SET_ROAMING_PREFERENCE: ret =  responseVoid(p); break;

            case RIL_REQUEST_CDMA_QUERY_ROAMING_PREFERENCE: ret =  responseInts(p); break;

            case RIL_REQUEST_SET_TTY_MODE: ret =  responseVoid(p); break;

            case RIL_REQUEST_QUERY_TTY_MODE: ret =  responseInts(p); break;

            case RIL_REQUEST_CDMA_SET_PREFERRED_VOICE_PRIVACY_MODE: ret =  responseVoid(p); break;

            case RIL_REQUEST_CDMA_QUERY_PREFERRED_VOICE_PRIVACY_MODE: ret =  responseInts(p); break;

            case RIL_REQUEST_CDMA_FLASH: ret =  responseVoid(p); break;

            case RIL_REQUEST_CDMA_BURST_DTMF: ret =  responseVoid(p); break;

            case RIL_REQUEST_CDMA_SEND_SMS: ret =  responseSMS(p); break;

            case RIL_REQUEST_CDMA_SMS_ACKNOWLEDGE: ret =  responseVoid(p); break;

            case RIL_REQUEST_GSM_GET_BROADCAST_CONFIG: ret =  responseGmsBroadcastConfig(p); break;

            case RIL_REQUEST_GSM_SET_BROADCAST_CONFIG: ret =  responseVoid(p); break;

            case RIL_REQUEST_GSM_BROADCAST_ACTIVATION: ret =  responseVoid(p); break;

            case RIL_REQUEST_CDMA_GET_BROADCAST_CONFIG: ret =  responseCdmaBroadcastConfig(p); break;

            case RIL_REQUEST_CDMA_SET_BROADCAST_CONFIG: ret =  responseVoid(p); break;

            case RIL_REQUEST_CDMA_BROADCAST_ACTIVATION: ret =  responseVoid(p); break;

            case RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY: ret =  responseVoid(p); break;

            case RIL_REQUEST_CDMA_SUBSCRIPTION: ret =  responseStrings(p); break;

            case RIL_REQUEST_CDMA_WRITE_SMS_TO_RUIM: ret =  responseInts(p); break;

            case RIL_REQUEST_CDMA_DELETE_SMS_ON_RUIM: ret =  responseVoid(p); break;

            case RIL_REQUEST_DEVICE_IDENTITY: ret =  responseStrings(p); break;

            case RIL_REQUEST_GET_SMSC_ADDRESS: ret = responseString(p); break;

            case RIL_REQUEST_SET_SMSC_ADDRESS: ret = responseVoid(p); break;

            case RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE: ret = responseVoid(p); break;

            case RIL_REQUEST_REPORT_SMS_MEMORY_STATUS: ret = responseVoid(p); break;

            case RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING: ret = responseVoid(p); break;

            case RIL_REQUEST_CDMA_GET_SUBSCRIPTION_SOURCE: ret =  responseInts(p); break;

            case RIL_REQUEST_ISIM_AUTHENTICATION: ret =  responseString(p); break;

            case RIL_REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU: ret = responseVoid(p); break;

            case RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS: ret = responseICC_IO(p); break;

            case RIL_REQUEST_VOICE_RADIO_TECH: ret = responseInts(p); break;

            default:

                throw new RuntimeException("Unrecognized solicited response: " + rr.mRequest);

            //break;

            }} catch (Throwable tr) {

                // Exceptions here usually mean invalid RIL responses



                Log.w(LOG_TAG, rr.serialString() + "< "

                        + requestToString(rr.mRequest)

                        + " exception, possible invalid RIL response", tr);



                if (rr.mResult != null) {

                    AsyncResult.forMessage(rr.mResult, null, tr);

                    rr.mResult.sendToTarget();

                }

                rr.release();

                return;

            }

        }



        if (error != 0) {

            switch (rr.mRequest) {

                case RIL_REQUEST_ENTER_SIM_PIN:

                case RIL_REQUEST_ENTER_SIM_PIN2:

                case RIL_REQUEST_CHANGE_SIM_PIN:

                case RIL_REQUEST_CHANGE_SIM_PIN2:

                case RIL_REQUEST_SET_FACILITY_LOCK:

                    if (mIccStatusChangedRegistrants != null) {

                        if (RILJ_LOGD) {

                            riljLog("ON some errors fakeSimStatusChanged: reg count="

                                    + mIccStatusChangedRegistrants.size());

                        }

                        mIccStatusChangedRegistrants.notifyRegistrants();

                    }

                    break;

            }



            rr.onError(error, ret);

            rr.release();

            return;

        }



        if (RILJ_LOGD) riljLog(rr.serialString() + "< " + requestToString(rr.mRequest)

            + " " + retToString(rr.mRequest, ret));



        if (rr.mResult != null) {

            AsyncResult.forMessage(rr.mResult, ret, null);

            rr.mResult.sendToTarget();

        }



        rr.release();

    }





    // CDMA FIXES, this fixes  bogus values in nv/sim on d2/jf/t0 cdma family

    private Object

    operatorCheck(Parcel p) {

        String response[] = (String[])responseStrings(p);

        for(int i=0; i<response.length; i++){

            if (response[i]!= null){

                if (response[i].equals("       Empty") || (response[i].equals("")&& i<2))

                    response[i]=operator;

                if (response[i].equals("31000")|| response[i].equals("11111") || response[i].equals("123456") || response[i].equals("31099") || (response[i].equals("")&& i>=2) )

                        response[i]=homeOperator;

            }

        }

        return response;

    }

    // handle exceptions

    private Object

    responseVoiceDataRegistrationState(Parcel p) {

        String response[] = (String[])responseStrings(p);

        if ( response.length>=10){

            for(int i=6; i<=9; i++){

                if (response[i]== null){

                    response[i]=Integer.toString(Integer.MAX_VALUE);

                } else {

                    try {

                        Integer.parseInt(response[i]);

                    } catch(NumberFormatException e) {

                        response[i]=Integer.toString(Integer.parseInt(response[i],16));

                    }

                }

            }

        }



        return response;

    }

    // has no effect

    // for debugging purposes , just generate out anything from response

    public static String s(String a[]){

        StringBuffer result = new StringBuffer();



        for (int i = 0; i < a.length; i++) {

            result.append( a[i] );

            result.append(",");

        }

        return result.toString();

    }

    // end  of cdma fix



    /**

     * Set audio parameter "wb_amr" for HD-Voice (Wideband AMR).

     *

     * @param state: 0 = unsupported, 1 = supported.

     * REQUIRED FOR JF FAMILY THIS SETS THE INFORMATION

     * CRASHES WITHOUT THIS FUNCTION

     * part of the new csd binary

     */

    private void setWbAmr(int state) {

        if (state == 1) {