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

Commit c771a338 authored by Shareef Ali's avatar Shareef Ali Committed by Gerrit Code Review
Browse files

Merge changes Ib7b288e5,Ic1323574 into cm-11.0 

* changes:
  SamsungQualcommRIL: fix power on and off state
  DCTracker: upgrade stubbed apn to Qcril Standard.
parents 7383e397 30a49d06

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

+2 −5
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ public class SamsungQualcommRIL extends RIL implements CommandsInterface { 
    @Override

    protected RadioState getRadioStateFromInt(int stateInt) {

        if(!oldRilState)

            super.getRadioStateFromInt(stateInt);

             return super.getRadioStateFromInt(stateInt);

        RadioState state;



        /* RIL_RadioState ril.h */
@@ -288,10 +288,7 @@ public class SamsungQualcommRIL extends RIL implements CommandsInterface { 
                ret = responseInts(p);

                setRadioPower(false, null);

                setPreferredNetworkType(mPreferredNetworkType, null);

                int cdmaSubscription = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.CDMA_SUBSCRIPTION_MODE, -1);

                if(cdmaSubscription != -1) {

                setCdmaSubscriptionSource(mCdmaSubscription, null);

                }

                if(mRilVersion >= 8)

                    setCellInfoListRate(Integer.MAX_VALUE, null);

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

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

+10 −5
Original line number Diff line number Diff line
@@ -1190,11 +1190,14 @@ public class DcTracker extends DcTrackerBase { 
        if (apnSetting == null) {

            if(PhoneConstants.PHONE_TYPE_CDMA==mPhone.getPhoneType()) {

                String[] mDunApnTypes = { PhoneConstants.APN_TYPE_DUN };

                final int mDefaultApnId = DctConstants.APN_DEFAULT_ID;

                final String[] mDefaultApnTypes = {

                    PhoneConstants.APN_TYPE_DEFAULT,

                    PhoneConstants.APN_TYPE_MMS,

                    PhoneConstants.APN_TYPE_HIPRI };

                    PhoneConstants.APN_TYPE_SUPL,

                    PhoneConstants.APN_TYPE_HIPRI,

                    PhoneConstants.APN_TYPE_FOTA,

                    PhoneConstants.APN_TYPE_IMS,

                    PhoneConstants.APN_TYPE_CBS };

                String[] types;

                int apnId;

                if (mRequestedApnType.equals(PhoneConstants.APN_TYPE_DUN)) {
@@ -1202,10 +1205,12 @@ public class DcTracker extends DcTrackerBase { 
                    apnId = DctConstants.APN_DUN_ID;

                } else {

                    types = mDefaultApnTypes;

                    apnId = mDefaultApnId;

                    apnId = DctConstants.APN_DEFAULT_ID;

                }

                apnSetting = new ApnSetting(apnId, "", "", "", "", "", "", "", "", "",

                                            "", 0, types, "IP", "IP", true, 0);

                apnSetting = new ApnSetting(apnId, getOperatorNumeric(), null, null,

                                            null, null, null, null, null, null, null,

                                            RILConstants.SETUP_DATA_AUTH_PAP_CHAP, types,

                                            PROPERTY_CDMA_IPPROTOCOL, PROPERTY_CDMA_ROAMING_IPPROTOCOL, true, 0);

                if (DBG) log("setupData: CDMA detected and apnSetting == null, use stubbed CDMA APN setting= " + apnSetting);

            } else {

                if (DBG) log("setupData: return for no apn found!");