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

Commit 8347d4a9 authored by Pawit Pornkitprasan's avatar Pawit Pornkitprasan
Browse files

telephony: DataConnection: support old RILs 

Older RILs require different technology value

Change-Id: Ia72bb1229132a00b5c343c0467823b895f0338d0
parent 049b7111

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+16 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ public final class DataConnection extends StateMachine { 
        }



        mPhone.mCi.setupDataCall(

                Integer.toString(cp.mRilRat + 2),

                Integer.toString(getRilRadioTechnology(cp.mRilRat)),

                Integer.toString(cp.mProfileId),

                mApnSetting.apn, mApnSetting.user, mApnSetting.password,

                Integer.toString(authType),
@@ -590,6 +590,21 @@ public final class DataConnection extends StateMachine { 
        if (DBG) log("NotifyDisconnectCompleted DisconnectParams=" + dp);

    }



    private int getRilRadioTechnology(int rilRadioTechnology) {

        if (mPhone.mCi.getRilVersion() < 6) {

            int phoneType = mPhone.getPhoneType();

            if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {

                return RILConstants.SETUP_DATA_TECH_GSM;

            } else if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {

                return RILConstants.SETUP_DATA_TECH_CDMA;

            } else {

                throw new RuntimeException("Unknown phoneType " + phoneType + ", should not happen");

            }

        } else {

            return rilRadioTechnology + 2;

        }

    }



    /*

     * **************************************************************************

     * Begin Members and methods owned by DataConnectionTracker but stored