From 124e28728b16cb63c700a323b9dfb1348580c896 Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Mon, 7 Mar 2011 16:37:10 -0800 Subject: [PATCH] Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop. Change-Id: I131c8323737b0b5122a5087c77d8c6102d74b138 --- .../cdma/CdmaDataConnectionTracker.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java index f2409e5dd8c48..345d0d95ed6c3 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java @@ -729,20 +729,19 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker { private void createAllDataConnectionList() { CdmaDataConnection dataConn; - /** TODO: Use one retry manager for all connections for now */ - RetryManager rm = new RetryManager(); - if (!rm.configure(SystemProperties.get("ro.cdma.data_retry_config"))) { - 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=" - + DEFAULT_DATA_RETRY_CONFIG); - rm.configure(20, 2000, 1000); - } - } - + String retryConfig = SystemProperties.get("ro.cdma.data_retry_config"); for (int i = 0; i < DATA_CONNECTION_POOL_SIZE; i++) { - int id = mUniqueIdGenerator.getAndIncrement(); + RetryManager rm = new RetryManager(); + 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=" + + DEFAULT_DATA_RETRY_CONFIG); + rm.configure(20, 2000, 1000); + } + } + int id = mUniqueIdGenerator.getAndIncrement(); dataConn = CdmaDataConnection.makeDataConnection(mCdmaPhone, id, rm); mDataConnections.put(id, dataConn); }