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

Commit f787a631 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "QualcommSharedRIL: Bypass CDMA subscription in handler switch to avoid... 

Merge "QualcommSharedRIL:  Bypass CDMA subscription in handler switch to avoid crashing of telephony stack." into jellybean
parents a675663a 097fd556

telephony/java/com/android/internal/telephony/HTCQualcommRIL.java

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public class HTCQualcommRIL extends QualcommSharedRIL implements CommandsInterfa 
            return status;



        int appIndex = -1;

        if (mPhoneType == RILConstants.CDMA_PHONE) {

        if (mPhoneType == RILConstants.CDMA_PHONE && !skipCdmaSubcription) {

            appIndex = status.getCdmaSubscriptionAppIndex();

            Log.d(LOG_TAG, "This is a CDMA PHONE " + appIndex);

        } else {

telephony/java/com/android/internal/telephony/QualcommSharedRIL.java

+3 −2
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ public class QualcommSharedRIL extends RIL implements CommandsInterface { 
    protected String[] mLastDataIface = new String[20];

    boolean RILJ_LOGV = true;

    boolean RILJ_LOGD = true;

    boolean skipCdmaSubcription = needsOldRilFeature("skipCdmaSubcription");



    private final int RIL_INT_RADIO_OFF = 0;

    private final int RIL_INT_RADIO_UNAVALIABLE = 1;
@@ -185,7 +186,7 @@ public class QualcommSharedRIL extends RIL implements CommandsInterface { 
            status.addApplication(ca);

        }

        int appIndex = -1;

        if (mPhoneType == RILConstants.CDMA_PHONE) {

        if (mPhoneType == RILConstants.CDMA_PHONE && !skipCdmaSubcription) {

            appIndex = status.getCdmaSubscriptionAppIndex();

            Log.d(LOG_TAG, "This is a CDMA PHONE " + appIndex);

        } else {
@@ -705,7 +706,7 @@ public class QualcommSharedRIL extends RIL implements CommandsInterface { 
                        mRil.setRadioState(CommandsInterface.RadioState.RADIO_ON);

                    } else {

                        int appIndex = -1;

                        if (mPhoneType == RILConstants.CDMA_PHONE) {

                        if (mPhoneType == RILConstants.CDMA_PHONE && !skipCdmaSubcription) {

                            appIndex = status.getCdmaSubscriptionAppIndex();

                            Log.d(LOG_TAG, "This is a CDMA PHONE " + appIndex);

                        } else {