am 4d9261fa: Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE (446a436c) · Commits · e / os / android_frameworks_base

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -846,9 +846,16 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
		return result;
		}

		private boolean dataConnectionNotInUse(DataConnectionAc dcac) {
		for (ApnContext apnContext : mApnContexts.values()) {
		if (apnContext.getDataConnectionAc() == dcac) return false;
		}
		return true;
		}

		private GsmDataConnection findFreeDataConnection() {
		for (DataConnectionAc dcac : mDataConnectionAsyncChannels.values()) {
		if (dcac.isInactiveSync()) {
		if (dcac.isInactiveSync() && dataConnectionNotInUse(dcac)) {
		log("findFreeDataConnection: found free GsmDataConnection");
		return (GsmDataConnection) dcac.dataConnection;
		}