am 8745caaf: am dbcc57c6: Fix dependencyMet issues regarding hipri APN. (7675faa7) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1535,6 +1535,9 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {

	@Override		@Override
	protected void onSetDependencyMet(String apnType, boolean met) {		protected void onSetDependencyMet(String apnType, boolean met) {
			// don't allow users to tweak hipri to work around default dependency not met
			if (Phone.APN_TYPE_HIPRI.equals(apnType)) return;

	ApnContext apnContext = mApnContexts.get(apnType);		ApnContext apnContext = mApnContexts.get(apnType);
	if (apnContext == null) {		if (apnContext == null) {
	loge("onSetDependencyMet: ApnContext not found in onSetDependencyMet(" +		loge("onSetDependencyMet: ApnContext not found in onSetDependencyMet(" +
	@@ -1542,6 +1545,11 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
	return;		return;
	}		}
	applyNewState(apnContext, apnContext.isEnabled(), met);		applyNewState(apnContext, apnContext.isEnabled(), met);
			if (Phone.APN_TYPE_DEFAULT.equals(apnType)) {
			// tie actions on default to similar actions on HIPRI regarding dependencyMet
			apnContext = mApnContexts.get(Phone.APN_TYPE_HIPRI);
			if (apnContext != null) applyNewState(apnContext, apnContext.isEnabled(), met);
			}
	}		}

	private void applyNewState(ApnContext apnContext, boolean enabled, boolean met) {		private void applyNewState(ApnContext apnContext, boolean enabled, boolean met) {