Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1 (aba79851) · Commits · e / os / android_frameworks_base

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

+11 −4

Original line number	Original line	Diff line number	Diff line
	@@ -136,7 +136,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
	private static final String INTENT_DATA_STALL_ALARM =		private static final String INTENT_DATA_STALL_ALARM =
	"com.android.internal.telephony.gprs-data-stall";		"com.android.internal.telephony.gprs-data-stall";

	static final Uri PREFERAPN_URI = Uri.parse("content://telephony/carriers/preferapn");		static final Uri PREFERAPN_NO_UPDATE_URI =
			Uri.parse("content://telephony/carriers/preferapn_no_update");
	static final String APN_ID = "apn_id";		static final String APN_ID = "apn_id";
	private boolean canSetPreferApn = false;		private boolean canSetPreferApn = false;

	@@ -2342,26 +2343,30 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {

	private void setPreferredApn(int pos) {		private void setPreferredApn(int pos) {
	if (!canSetPreferApn) {		if (!canSetPreferApn) {
			log("setPreferredApn: X !canSEtPreferApn");
	return;		return;
	}		}

			log("setPreferredApn: delete");
	ContentResolver resolver = mPhone.getContext().getContentResolver();		ContentResolver resolver = mPhone.getContext().getContentResolver();
	resolver.delete(PREFERAPN_URI, null, null);		resolver.delete(PREFERAPN_NO_UPDATE_URI, null, null);

	if (pos >= 0) {		if (pos >= 0) {
			log("setPreferredApn: insert");
	ContentValues values = new ContentValues();		ContentValues values = new ContentValues();
	values.put(APN_ID, pos);		values.put(APN_ID, pos);
	resolver.insert(PREFERAPN_URI, values);		resolver.insert(PREFERAPN_NO_UPDATE_URI, values);
	}		}
	}		}

	private ApnSetting getPreferredApn() {		private ApnSetting getPreferredApn() {
	if (mAllApns.isEmpty()) {		if (mAllApns.isEmpty()) {
			log("getPreferredApn: X not found mAllApns.isEmpty");
	return null;		return null;
	}		}

	Cursor cursor = mPhone.getContext().getContentResolver().query(		Cursor cursor = mPhone.getContext().getContentResolver().query(
	PREFERAPN_URI, new String[] { "_id", "name", "apn" },		PREFERAPN_NO_UPDATE_URI, new String[] { "_id", "name", "apn" },
	null, null, Telephony.Carriers.DEFAULT_SORT_ORDER);		null, null, Telephony.Carriers.DEFAULT_SORT_ORDER);

	if (cursor != null) {		if (cursor != null) {
	@@ -2376,6 +2381,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
	pos = cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers._ID));		pos = cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers._ID));
	for(ApnSetting p:mAllApns) {		for(ApnSetting p:mAllApns) {
	if (p.id == pos && p.canHandleType(mRequestedApnType)) {		if (p.id == pos && p.canHandleType(mRequestedApnType)) {
			log("getPreferredApn: X found apnSetting" + p);
	cursor.close();		cursor.close();
	return p;		return p;
	}		}
	@@ -2386,6 +2392,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
	cursor.close();		cursor.close();
	}		}

			log("getPreferredApn: X not found");
	return null;		return null;
	}		}