Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up some debug statements." into honeycomb-LTE

Browse Source
This commit is contained in:
Wink Saville
2011-06-15 13:55:06 -07:00
committed by Android (Google) Code Review
parent 3dc1b5e26f eddc3a579c
commit 4d6233b2ed
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/com/android/internal/telephony/DataCallState.java
View File

@@ -202,7 +202,7 @@ public class DataCallState {
result = SetupResult.SUCCESS; result = SetupResult.SUCCESS;
} catch (UnknownHostException e) { } catch (UnknownHostException e) {
Log.d(LOG_TAG, "onSetupCompleted: UnknownHostException " + e); Log.d(LOG_TAG, "setLinkProperties: UnknownHostException " + e);
e.printStackTrace(); e.printStackTrace();
result = SetupResult.ERR_UnacceptableParameter; result = SetupResult.ERR_UnacceptableParameter;
} }
@@ -216,8 +216,10 @@ public class DataCallState {
// An error occurred so clear properties // An error occurred so clear properties
if (result != SetupResult.SUCCESS) { if (result != SetupResult.SUCCESS) {
if(DBG) Log.d(LOG_TAG, if(DBG) {
"onSetupConnectionCompleted with an error, clearing LinkProperties"); Log.d(LOG_TAG, "setLinkProperties: error clearing LinkProperties " +
"status=" + status + " result=" + result);
}
linkProperties.clear(); linkProperties.clear();
} }

6
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
View File

@@ -1850,7 +1850,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
if (!dc.configureRetry(SystemProperties.get("ro.gsm.data_retry_config"))) { if (!dc.configureRetry(SystemProperties.get("ro.gsm.data_retry_config"))) {
if (!dc.configureRetry(DEFAULT_DATA_RETRY_CONFIG)) { if (!dc.configureRetry(DEFAULT_DATA_RETRY_CONFIG)) {
// Should never happen, log an error and default to a simple linear sequence. // 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); "DEFAULT_DATA_RETRY_CONFIG=" + DEFAULT_DATA_RETRY_CONFIG);
dc.configureRetry(20, 2000, 1000); 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(SystemProperties.get("ro.gsm.2nd_data_retry_config"))) {
if (!dc.configureRetry(SECONDARY_DATA_RETRY_CONFIG)) { if (!dc.configureRetry(SECONDARY_DATA_RETRY_CONFIG)) {
// Should never happen, log an error and default to a simple sequence. // 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); "SECONDARY_DATA_RETRY_CONFIG=" + SECONDARY_DATA_RETRY_CONFIG);
dc.configureRetry("max_retries=3, 333, 333, 333"); dc.configureRetry("max_retries=3, 333, 333, 333");
} }
@@ -1872,7 +1872,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
if (DBG) log("destroyDataConnections: clear mDataConnectionList"); if (DBG) log("destroyDataConnections: clear mDataConnectionList");
mDataConnections.clear(); mDataConnections.clear();
} else { } else {
if (DBG) log("destroyDataConnectionList mDataConnecitonList is empty, ignore"); if (DBG) log("destroyDataConnections: mDataConnecitonList is empty, ignore");
} }
} }