am 175442fc: Revert "Revert "Act on no-prefered-apn-on-connect config option."" (674c0b56) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

+15 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.content.ContentValues;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.res.Resources;
		import android.database.ContentObserver;
		import android.database.Cursor;
		import android.net.ConnectivityManager;
		@@ -2127,7 +2128,20 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
		String operator = (r != null) ? r.getOperatorNumeric() : "";
		int radioTech = mPhone.getServiceState().getRilRadioTechnology();

		if (canSetPreferApn && mPreferredApn != null &&
		// 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
		// connection we are locked to it for life. This change allows ATT devices
		// to say they don't want to use preferred at all.
		boolean usePreferred = true;
		try {
		usePreferred = ! mPhone.getContext().getResources().getBoolean(com.android.
		internal.R.bool.config_dontPreferApn);
		} catch (Resources.NotFoundException e) {
		usePreferred = true;
		}

		if (usePreferred && canSetPreferApn && mPreferredApn != null &&
		mPreferredApn.canHandleType(requestedApnType)) {
		if (DBG) {
		log("buildWaitingApns: Preferred APN:" + operator + ":"