Merge "Fix cdma data calls based on NV" into cm-11.0 (479c0231) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,7 @@ public interface Phone {
		static final String REASON_LOST_DATA_CONNECTION = "lostDataConnection";
		static final String REASON_CONNECTED = "connected";
		static final String REASON_SINGLE_PDN_ARBITRATION = "SinglePdnArbitration";
		static final String REASON_NV_READY = "nvReady";

		// Used for band mode selection methods
		static final int BM_UNSPECIFIED = 0; // selected by baseband automatically

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -136,7 +136,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";

		// Constructors
		public CDMAPhone(Context context, CommandsInterface ci, PhoneNotifier notifier) {

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -455,10 +455,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();
		}
		@@ -468,6 +469,10 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
		mPhone.notifyDataConnection(null);
		}

		if (hasCdmaDataConnectionAttached \|\| has4gHandoff) {
		mAttachedRegistrants.notifyRegistrants();
		}

		if (hasRoamingOn) {
		mRoamingOnRegistrants.notifyRegistrants();
		}

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -1107,10 +1107,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();
		}
		@@ -1120,6 +1121,10 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
		mPhone.notifyDataConnection(null);
		}

		if (hasCdmaDataConnectionAttached) {
		mAttachedRegistrants.notifyRegistrants();
		}

		if (hasRoamingOn) {
		mRoamingOnRegistrants.notifyRegistrants();
		}

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

+128 −30

Original line number	Diff line number	Diff line
		@@ -58,6 +58,8 @@ import com.android.internal.telephony.DctConstants;
		import com.android.internal.telephony.EventLogTags;
		import com.android.internal.telephony.TelephonyIntents;
		import com.android.internal.telephony.gsm.GSMPhone;
		import com.android.internal.telephony.cdma.CDMAPhone;
		import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.RILConstants;
		import com.android.internal.telephony.uicc.IccRecords;
		@@ -113,6 +115,8 @@ public final class DcTracker extends DcTrackerBase {
		/** Watches for changes to the APN db. */
		private ApnChangeObserver mApnObserver;

		private CdmaSubscriptionSourceManager mCdmaSsm;

		//***** Constructor

		public DcTracker(PhoneBase p) {
		@@ -138,6 +142,16 @@ public final class DcTracker extends DcTrackerBase {
		DctConstants.EVENT_PS_RESTRICT_ENABLED, null);
		p.getServiceStateTracker().registerForPsRestrictedDisabled(this,
		DctConstants.EVENT_PS_RESTRICT_DISABLED, null);
		p.getServiceStateTracker().registerForDataRegStateOrRatChanged(this,
		DctConstants.EVENT_DATA_RAT_CHANGED, null);

		if (p.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
		mCdmaSsm = CdmaSubscriptionSourceManager.getInstance(
		p.getContext(), p.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));
		}

		mDataConnectionTracker = this;

		@@ -169,7 +183,7 @@ public final class DcTracker extends DcTrackerBase {

		@Override
		public void dispose() {
		if (DBG) log("GsmDCT.dispose");
		if (DBG) log("dispose");
		cleanUpAllConnections(true, null);

		super.dispose();
		@@ -193,6 +207,9 @@ public final class DcTracker extends DcTrackerBase {
		mApnContexts.clear();
		mPrioritySortedApnContexts.clear();

		if (mCdmaSsm != null) {
		mCdmaSsm.dispose(this);
		}
		destroyDataConnections();
		}

		@@ -574,10 +591,11 @@ public final class DcTracker extends DcTrackerBase {
		boolean desiredPowerState = mPhone.getServiceStateTracker().getDesiredPowerState();
		IccRecords r = mIccRecords.get();
		boolean recordsLoaded = (r != null) ? r.getRecordsLoaded() : false;
		boolean subscriptionFromNv = isNvSubscription();

		boolean allowed =
		(attachedState \|\| mAutoAttachOnCreation) &&
		recordsLoaded &&
		(subscriptionFromNv \|\| recordsLoaded) &&
		(mPhone.getState() == PhoneConstants.State.IDLE \|\|
		mPhone.getServiceStateTracker().isConcurrentVoiceAndDataAllowed()) &&
		internalDataEnabled &&
		@@ -589,7 +607,9 @@ public final class DcTracker extends DcTrackerBase {
		if (!(attachedState \|\| mAutoAttachOnCreation)) {
		reason += " - Attached= " + attachedState;
		}
		if (!recordsLoaded) reason += " - SIM not loaded";
		if (!(subscriptionFromNv \|\| recordsLoaded)) {
		reason += " - SIM not loaded and not NV subscription";
		}
		if (mPhone.getState() != PhoneConstants.State.IDLE &&
		!mPhone.getServiceStateTracker().isConcurrentVoiceAndDataAllowed()) {
		reason += " - PhoneState= " + mPhone.getState();
		@@ -1110,6 +1130,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);
		@@ -1121,12 +1146,12 @@ 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();
		cleanUpAllConnections(!isDisconnected, Phone.REASON_APN_CHANGED);
		cleanUpAllConnections(!isDisconnected, reason);
		if (isDisconnected) {
		setupDataOnConnectableApns(Phone.REASON_APN_CHANGED);
		setupDataOnConnectableApns(reason);
		}
		}

		@@ -1342,6 +1367,12 @@ public final class DcTracker extends DcTrackerBase {
		setupDataOnConnectableApns(Phone.REASON_SIM_LOADED);
		}

		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
		@@ -1854,12 +1885,17 @@ public final class DcTracker extends DcTrackerBase {

		// If APN is still enabled, try to bring it back up automatically
		if (mAttached.get() && apnContext.isReady() && retryAfterDisconnected(apnContext)) {
		if (apnContext.getReason().equals(Phone.REASON_NW_TYPE_CHANGED)) {
		// Retry immediately if reason is nw_type_changed (like rat switch, for instance)
		setupDataOnConnectableApns(Phone.REASON_NW_TYPE_CHANGED);
		} else {
		SystemProperties.set(PUPPET_MASTER_RADIO_STRESS_TEST, "false");
		// Wait a bit before trying the next APN, so that
		// we're not tying up the RIL command channel.
		// This also helps in any external dependency to turn off the context.
		if(DBG) log("onDisconnectDone: attached, ready and retry after disconnect");
		startAlarmForReconnect(getApnDelay(), apnContext);
		}
		} else {
		boolean restartRadioAfterProvisioning = mPhone.getContext().getResources().getBoolean(
		com.android.internal.R.bool.config_restartRadioAfterProvisioning);
		@@ -1985,14 +2021,43 @@ 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;
		}

		/**
		* Based on the sim operator numeric, create a list for all possible
		* 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 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() : "";
		String operator = getOperatorNumeric();
		if (operator != null) {
		String selection = "numeric = '" + operator + "'";
		// query only enabled apn.
		@@ -2076,9 +2141,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
		@@ -2096,8 +2159,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 &&
		@@ -2122,7 +2184,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 (DBG) log("buildWaitingApns: apn=" + apn);
		@@ -2319,6 +2381,20 @@ public final class DcTracker extends DcTrackerBase {
		}
		break;

		case DctConstants.EVENT_CDMA_SUBSCRIPTION_SOURCE_CHANGED: // fall thru
		case DctConstants.EVENT_DATA_RAT_CHANGED:
		// 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;

		default:
		// handle the message in the super class DataConnectionTracker
		super.handleMessage(msg);
		@@ -2356,28 +2432,50 @@ public final class DcTracker extends DcTrackerBase {
		return cid;
		}

		/**
		* @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 = mUiccController.getIccRecords(UiccController.APP_FAM_3GPP);
		int dataRat = mPhone.getServiceState().getRilDataRadioTechnology();
		int appFamily = UiccController.getFamilyFromRadioTechnology(dataRat);
		IccRecords newIccRecords = mUiccController.getIccRecords(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);
		}
		// Records changed -> return true
		result = true;
		}
		return result;
		}

		@Override