Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop. (124e2872) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java

+10 −11

Original line number	Diff line number	Diff line
		@@ -729,9 +729,10 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
		private void createAllDataConnectionList() {
		CdmaDataConnection dataConn;

		/** TODO: Use one retry manager for all connections for now */
		String retryConfig = SystemProperties.get("ro.cdma.data_retry_config");
		for (int i = 0; i < DATA_CONNECTION_POOL_SIZE; i++) {
		RetryManager rm = new RetryManager();
		if (!rm.configure(SystemProperties.get("ro.cdma.data_retry_config"))) {
		if (!rm.configure(retryConfig)) {
		if (!rm.configure(DEFAULT_DATA_RETRY_CONFIG)) {
		// Should never happen, log an error and default to a simple linear sequence.
		log("Could not configure using DEFAULT_DATA_RETRY_CONFIG="
		@@ -740,9 +741,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
		}
		}

		for (int i = 0; i < DATA_CONNECTION_POOL_SIZE; i++) {
		int id = mUniqueIdGenerator.getAndIncrement();

		dataConn = CdmaDataConnection.makeDataConnection(mCdmaPhone, id, rm);
		mDataConnections.put(id, dataConn);
		}