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

Commit e5dd24f3 authored by Alex Yakavenka's avatar Alex Yakavenka Committed by Linux Build Service Account
Browse files

Fix cdma data calls based on NV. 

For NV data calls we need to create dummy profiles
When DcTracker switches from lte to cdma we need to bring
down existing data call and establish new one (same goes
for switching cdma->lte)

Change-Id: I7ad8d0632854ea9875afb76709c1ba894bf048fd
parent 1576a555

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

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ public interface Phone { 
    static final String REASON_DATA_DEPENDENCY_UNMET = "dependencyUnmet";

    static final String REASON_LOST_DATA_CONNECTION = "lostDataConnection";

    static final String REASON_CONNECTED = "connected";

    static final String REASON_NV_READY = "nvReady";

    static final String REASON_SINGLE_PDN_ARBITRATION = "SinglePdnArbitration";

    static final String REASON_DATA_SPECIFIC_DISABLED = "specificDisabled";

    static final String REASON_SIM_NOT_READY = "simNotReady";

src/java/com/android/internal/telephony/cdma/CDMAPhone.java

+2 −1
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ public class CDMAPhone extends PhoneBase { 


    Registrant mPostDialHandler;



    static String PROPERTY_CDMA_HOME_OPERATOR_NUMERIC = "ro.cdma.home.operator.numeric";

    public static final String PROPERTY_CDMA_HOME_OPERATOR_NUMERIC =

            "ro.cdma.home.operator.numeric";



    public CDMAPhone(Context context, CommandsInterface ci, PhoneNotifier notifier,

            int phoneId) {

src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java

+8 −4
Original line number Diff line number Diff line
@@ -527,10 +527,11 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
            mPhone.notifyServiceStateChanged(mSS);

        }



        if (hasCdmaDataConnectionAttached || has4gHandoff) {

            mAttachedRegistrants.notifyRegistrants();

        }



        // First notify detached, then rat changed, then attached - that's the way it

        // happens in the modem.

        // Behavior of recipients (DcTracker, for instance) depends on this sequence

        // since DcTracker reloads profiles on "rat_changed" notification and sets up

        // data call on "attached" notification.

        if (hasCdmaDataConnectionDetached) {

            mDetachedRegistrants.notifyRegistrants();

        }
@@ -556,6 +557,9 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
        if (hasDataRoamingOn) {

            mDataRoamingOnRegistrants.notifyRegistrants();

        }

        if (hasCdmaDataConnectionAttached || has4gHandoff) {

            mAttachedRegistrants.notifyRegistrants();

        }



        if (hasDataRoamingOff) {

            mDataRoamingOffRegistrants.notifyRegistrants();

src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+9 −4
Original line number Diff line number Diff line
@@ -1322,10 +1322,11 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
            mPhone.notifyServiceStateChanged(mSS);

        }



        if (hasCdmaDataConnectionAttached) {

            mAttachedRegistrants.notifyRegistrants();

        }



        // First notify detached, then rat changed, then attached - that's the way it

        // happens in the modem.

        // Behavior of recipients (DcTracker, for instance) depends on this sequence

        // since DcTracker reloads profiles on "rat_changed" notification and sets up

        // data call on "attached" notification.

        if (hasCdmaDataConnectionDetached) {

            mDetachedRegistrants.notifyRegistrants();

        }
@@ -1352,6 +1353,10 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
            mDataRoamingOnRegistrants.notifyRegistrants();

        }



        if (hasCdmaDataConnectionAttached) {

            mAttachedRegistrants.notifyRegistrants();

        }



        if (hasDataRoamingOff) {

            mDataRoamingOffRegistrants.notifyRegistrants();

        }

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

+114 −24
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ import com.android.internal.telephony.DctConstants; 
import com.android.internal.telephony.EventLogTags;

import com.android.internal.telephony.ITelephony;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.cdma.CDMAPhone;

import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;

import com.android.internal.telephony.gsm.GSMPhone;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.RILConstants;
@@ -142,6 +144,7 @@ public final class DcTracker extends DcTrackerBase { 
    private final String mProvisionActionName;

    private BroadcastReceiver mProvisionBroadcastReceiver;

    private ProgressDialog mProvisioningSpinner;

    private CdmaSubscriptionSourceManager mCdmaSsm;



    public boolean mImsRegistrationState = false;

    private ApnContext mWaitCleanUpApnContext = null;
@@ -207,6 +210,13 @@ public final class DcTracker extends DcTrackerBase { 
     //          DctConstants.EVENT_CLEAN_UP_ALL_CONNECTIONS, null);

        mPhone.getServiceStateTracker().registerForDataRegStateOrRatChanged(this,

                DctConstants.EVENT_DATA_RAT_CHANGED, null);

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

            mCdmaSsm = CdmaSubscriptionSourceManager.getInstance(

                    mPhone.getContext(), mPhone.mCi, this,

                    DctConstants.EVENT_CDMA_SUBSCRIPTION_SOURCE_CHANGED, null);

            // CdmaSsm doesn't send this event whenever you register - fake it ourselves

            sendMessage(obtainMessage(DctConstants.EVENT_CDMA_SUBSCRIPTION_SOURCE_CHANGED));

        }

    }

    @Override

    public void dispose() {
@@ -229,6 +239,10 @@ public final class DcTracker extends DcTrackerBase { 
        mApnContexts.clear();

        mPrioritySortedApnContexts.clear();



        if (mCdmaSsm != null) {

            mCdmaSsm.dispose(this);

        }



        destroyDataConnections();

    }

    protected void unregisterForAllEvents() {
@@ -709,13 +723,14 @@ public final class DcTracker extends DcTrackerBase { 


        boolean attachedState = mAttached.get();

        boolean desiredPowerState = mPhone.getServiceStateTracker().getDesiredPowerState();

        IccRecords r = mIccRecords.get();

        boolean recordsLoaded = (r != null) ? r.getRecordsLoaded() : false;

        boolean subscriptionFromNv = isNvSubscription();

        int radioTech = mPhone.getServiceState().getRilDataRadioTechnology();

        if (radioTech == ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN) {

            desiredPowerState = true;

        }



        IccRecords r = mIccRecords.get();

        boolean recordsLoaded = false;

        if (r != null) {

            recordsLoaded = r.getRecordsLoaded();

            if (DBG && !recordsLoaded) log("isDataAllowed getRecordsLoaded=" + recordsLoaded);
@@ -745,6 +760,7 @@ public final class DcTracker extends DcTrackerBase { 
                    (attachedState || mAutoAttachOnCreation.get()) &&

                    recordsLoaded &&

                    (state == PhoneConstants.State.IDLE ||

                    (subscriptionFromNv || recordsLoaded) &&

                     mPhone.getServiceStateTracker().isConcurrentVoiceAndDataAllowed()) &&

                    internalDataEnabled &&

                    defaultDataSelected &&
@@ -758,6 +774,9 @@ public final class DcTracker extends DcTrackerBase { 
                reason += " - Attached= " + attachedState;

            }

            if (!recordsLoaded) reason += " - SIM not loaded";

            if (!(subscriptionFromNv || recordsLoaded)) {

                reason += " - SIM not loaded and not NV subscription";

            }

            if (state != PhoneConstants.State.IDLE &&

                    !mPhone.getServiceStateTracker().isConcurrentVoiceAndDataAllowed()) {

                reason += " - PhoneState= " + state;
@@ -1324,6 +1343,11 @@ public final class DcTracker extends DcTrackerBase { 
     * Handles changes to the APN database.

     */

    private void onApnChanged() {

        if(DBG) log("onApnChanged: tryRestartDataConnections");

        tryRestartDataConnections(Phone.REASON_APN_CHANGED);

    }



    private void tryRestartDataConnections(String reason) {

        DctConstants.State overallState = getOverallState();

        boolean isDisconnected = (overallState == DctConstants.State.IDLE ||

                overallState == DctConstants.State.FAILED);
@@ -1335,15 +1359,14 @@ public final class DcTracker extends DcTrackerBase { 


        // TODO: It'd be nice to only do this if the changed entrie(s)

        // match the current operator.

        if (DBG) log("onApnChanged: createAllApnList and cleanUpAllConnections");

        if (DBG) log("tryRestartDataConnections: createAllApnList and cleanUpAllConnections");

        createAllApnList();

        setInitialAttachApn();

        cleanUpConnectionsOnUpdatedApns(!isDisconnected);



        // FIXME: See bug 17426028 maybe no conditional is needed.

        if (mPhone.getSubId() == SubscriptionManager.getDefaultDataSubId()) {

            setupDataOnConnectableApns(Phone.REASON_APN_CHANGED);

        }

        cleanUpAllConnections(!isDisconnected, reason);

        setupDataOnConnectableApns(reason);

    }



    /**
@@ -1512,6 +1535,12 @@ public final class DcTracker extends DcTrackerBase { 
        mAutoAttachOnCreationConfig = false;

    }



    private void onNvReady() {

        if (DBG) log("onNvReady");

        createAllApnList();

        setupDataOnConnectableApns(Phone.REASON_NV_READY);

    }



    @Override

    protected void onSetDependencyMet(String apnType, boolean met) {

        // don't allow users to tweak hipri to work around default dependency not met
@@ -2229,15 +2258,44 @@ public final class DcTracker extends DcTrackerBase { 
        notifyOffApnsOfAvailability(reason);

    }



    private boolean isNvSubscription() {

        int radioTech = mPhone.getServiceState().getRilDataRadioTechnology();

        if (mCdmaSsm == null) {

            return false;

        }

        if (UiccController.getFamilyFromRadioTechnology(radioTech) == UiccController.APP_FAM_3GPP2

                && mCdmaSsm.getCdmaSubscriptionSource() ==

                        CdmaSubscriptionSourceManager.SUBSCRIPTION_FROM_NV) {

            return true;

        }

        return false;

    }



    /**

     * Returns mccmnc for data call either from cdma_home_operator or from IccRecords

     * @return operator numeric

     */

    private String getOperatorNumeric() {

        String result;

        if (isNvSubscription()) {

            result = SystemProperties.get(CDMAPhone.PROPERTY_CDMA_HOME_OPERATOR_NUMERIC);

            log("getOperatorNumberic - returning from NV: " + result);

        } else {

            IccRecords r = mIccRecords.get();

            result = (r != null) ? r.getOperatorNumeric() : "";

            log("getOperatorNumberic - returning from card: " + result);

        }

        return result;

    }



    /**

     * Based on the sim operator numeric, create a list for all possible

     * Based on the operator numeric, create a list for all possible

     * Data Connections and setup the preferredApn.

     */

    private void createAllApnList() {

        mAllApnSettings = new ArrayList<ApnSetting>();

        IccRecords r = mIccRecords.get();

        String operator = (r != null) ? r.getOperatorNumeric() : "";

        if (operator != null) {

        String operator = getOperatorNumeric();

        if (operator != null && !operator.isEmpty()) {

            String selection = "numeric = '" + operator + "'";

            String orderBy = "_id";

            // query only enabled apn.
@@ -2437,9 +2495,7 @@ public final class DcTracker extends DcTrackerBase { 
            }

        }



        IccRecords r = mIccRecords.get();

        String operator = (r != null) ? r.getOperatorNumeric() : "";



        String operator = getOperatorNumeric();

        // This is a workaround for a bug (7305641) where we don't failover to other

        // suitable APNs if our preferred APN fails.  On prepaid ATT sims we need to

        // failover to a provisioning APN, but once we've used their default data
@@ -2460,8 +2516,7 @@ public final class DcTracker extends DcTrackerBase { 
            log("buildWaitingApns: usePreferred=" + usePreferred

                    + " canSetPreferApn=" + mCanSetPreferApn

                    + " mPreferredApn=" + mPreferredApn

                    + " operator=" + operator + " radioTech=" + radioTech

                    + " IccRecords r=" + r);

                    + " operator=" + operator + " radioTech=" + radioTech);

        }



        if (usePreferred && mCanSetPreferApn && mPreferredApn != null &&
@@ -2486,7 +2541,7 @@ public final class DcTracker extends DcTrackerBase { 
                mPreferredApn = null;

            }

        }

        if (mAllApnSettings != null) {

        if (mAllApnSettings != null && !mAllApnSettings.isEmpty()) {

            if (DBG) log("buildWaitingApns: mAllApnSettings=" + mAllApnSettings);

            for (ApnSetting apn : mAllApnSettings) {

                if (apn.canHandleType(requestedApnType)) {
@@ -2499,11 +2554,13 @@ public final class DcTracker extends DcTrackerBase { 
                                    "not include radioTech:" + radioTech);

                        }

                    }

                } else if (DBG) {

                } else {

                    if (DBG) {

                        log("buildWaitingApns: couldn't handle requesedApnType="

                                + requestedApnType);

                    }

                }

            }

        } else {

            loge("mAllApnSettings is null!");

        }
@@ -2688,10 +2745,21 @@ public final class DcTracker extends DcTrackerBase { 
                super.handleMessage(mCause);

                break;



            case DctConstants.EVENT_CDMA_SUBSCRIPTION_SOURCE_CHANGED: // fall thru

            case DctConstants.EVENT_DATA_RAT_CHANGED:

                //May new Network allow setupData, so try it here

                setupDataOnConnectableApns(Phone.REASON_NW_TYPE_CHANGED,

                        RetryFailures.ONLY_ON_CHANGE);

                // When data rat changes we might need to load different

                // set of apns (example, LTE->1x)

                if (onUpdateIcc()) {

                    log("onUpdateIcc: tryRestartDataConnections " + Phone.REASON_NW_TYPE_CHANGED);

                    tryRestartDataConnections(Phone.REASON_NW_TYPE_CHANGED);

                } else if (isNvSubscription()){

                    // If cdma subscription source changed to NV or data rat changed to cdma

                    // (while subscription source was NV) - we need to trigger NV ready

                    onNvReady();

                }

                break;



            case DctConstants.CMD_CLEAR_PROVISIONING_SPINNER:
@@ -2744,30 +2812,52 @@ public final class DcTracker extends DcTrackerBase { 
    }





    /**

     * @description This function updates mIccRecords reference to track

     *              currently used IccRecords

     * @return true if IccRecords changed

     */

    @Override

    protected void onUpdateIcc() {

    protected boolean onUpdateIcc() {

        boolean result = false;

        if (mUiccController == null ) {

            return;

            loge("onUpdateIcc: mUiccController is null. Error!");

            return false;

        }



        IccRecords newIccRecords = getUiccRecords(UiccController.APP_FAM_3GPP);

        int dataRat = mPhone.getServiceState().getRilDataRadioTechnology();

        int appFamily = UiccController.getFamilyFromRadioTechnology(dataRat);

        IccRecords newIccRecords = getUiccRecords(appFamily);

        log("onUpdateIcc: newIccRecords " + ((newIccRecords != null) ?

                newIccRecords.getClass().getName() : null));

        if (dataRat == ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN) {

            // Ignore this. This could be due to data not registered

            // We want to ignore RADIO_TECHNOLOGY_UNKNOWN so that we do not tear down data

            // call in case we are out of service.

            return false;

        }



        IccRecords r = mIccRecords.get();

        if (r != newIccRecords) {

            if (r != null) {

                log("Removing stale icc objects.");

                log("Removing stale icc objects. " + ((r != null) ?

                        r.getClass().getName() : null));

                r.unregisterForRecordsLoaded(this);

                mIccRecords.set(null);

            }

            if (newIccRecords != null) {

                log("New records found");

                log("New records found " + ((newIccRecords != null) ?

                        newIccRecords.getClass().getName() : null));

                mIccRecords.set(newIccRecords);

                newIccRecords.registerForRecordsLoaded(

                        this, DctConstants.EVENT_RECORDS_LOADED, null);

            } else {

                onSimNotReady();

            }

            // Records changed -> return true

            result = true;

        }

        return result;

    }



    public void update() {