am aff9ec70: am 4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTE (f3e3edb2) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/DataCallState.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -202,7 +202,7 @@ public class DataCallState {

		result = SetupResult.SUCCESS;
		} catch (UnknownHostException e) {
		Log.d(LOG_TAG, "onSetupCompleted: UnknownHostException " + e);
		Log.d(LOG_TAG, "setLinkProperties: UnknownHostException " + e);
		e.printStackTrace();
		result = SetupResult.ERR_UnacceptableParameter;
		}
		@@ -216,8 +216,10 @@ public class DataCallState {

		// An error occurred so clear properties
		if (result != SetupResult.SUCCESS) {
		if(DBG) Log.d(LOG_TAG,
		"onSetupConnectionCompleted with an error, clearing LinkProperties");
		if(DBG) {
		Log.d(LOG_TAG, "setLinkProperties: error clearing LinkProperties " +
		"status=" + status + " result=" + result);
		}
		linkProperties.clear();
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -1850,7 +1850,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
		if (!dc.configureRetry(SystemProperties.get("ro.gsm.data_retry_config"))) {
		if (!dc.configureRetry(DEFAULT_DATA_RETRY_CONFIG)) {
		// Should never happen, log an error and default to a simple linear sequence.
		loge("createDataConnection: Could not configure using " +
		loge("configureRetry: Could not configure using " +
		"DEFAULT_DATA_RETRY_CONFIG=" + DEFAULT_DATA_RETRY_CONFIG);
		dc.configureRetry(20, 2000, 1000);
		}
		@@ -1859,7 +1859,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
		if (!dc.configureRetry(SystemProperties.get("ro.gsm.2nd_data_retry_config"))) {
		if (!dc.configureRetry(SECONDARY_DATA_RETRY_CONFIG)) {
		// Should never happen, log an error and default to a simple sequence.
		loge("createDataConnection: Could note configure using " +
		loge("configureRetry: Could note configure using " +
		"SECONDARY_DATA_RETRY_CONFIG=" + SECONDARY_DATA_RETRY_CONFIG);
		dc.configureRetry("max_retries=3, 333, 333, 333");
		}
		@@ -1872,7 +1872,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
		if (DBG) log("destroyDataConnections: clear mDataConnectionList");
		mDataConnections.clear();
		} else {
		if (DBG) log("destroyDataConnectionList mDataConnecitonList is empty, ignore");
		if (DBG) log("destroyDataConnections: mDataConnecitonList is empty, ignore");
		}
		}