Merge "Telephony: GDCT - Set enabled state before notification is sent out." into honeycomb-LTE (a9378485) · Commits · e / os / android_frameworks_base

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

+6 −16

Original line number	Diff line number	Diff line
		@@ -545,16 +545,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
		return false;
		}

		protected boolean isEnabled(String apnType) {
		ApnContext apnContext = mApnContexts.get(apnType);
		if (apnContext == null) return false;
		if (apnContext.getState() == State.DISCONNECTING
		&& apnContext.getPendingAction() == ApnContext.PENDING_ACTION_APN_DISABLE) {
		return false;
		}
		return true;
		}

		/**
		* Report on whether data connectivity is enabled for any APN.
		* @return {@code false} if data connectivity has been explicitly disabled,
		@@ -1613,6 +1603,12 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {

		mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());

		// Check if APN disabled.
		if (apnContext.getPendingAction() == ApnContext.PENDING_ACTION_APN_DISABLE) {
		apnContext.setEnabled(false);
		apnContext.setPendingAction(ApnContext.PENDING_ACTION_NONE);
		}

		// if all data connection are gone, check whether Airplane mode request was
		// pending.
		if (!isConnected()) {
		@@ -1622,12 +1618,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
		}
		}

		// Check if APN disabled.
		if (apnContext.getPendingAction() == ApnContext.PENDING_ACTION_APN_DISABLE) {
		apnContext.setEnabled(false);
		apnContext.setPendingAction(ApnContext.PENDING_ACTION_NONE);
		}

		if (TextUtils.equals(apnContext.getApnType(), Phone.APN_TYPE_DEFAULT)
		&& retryAfterDisconnected(apnContext.getReason())) {
		SystemProperties.set("gsm.defaultpdpcontext.active", "false");