diff options
| author | Wink Saville <wink@google.com> | 2011-06-15 13:58:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-15 13:58:20 -0700 |
| commit | aff9ec70e22abb64149e335ae2eb519c6027eb4a (patch) | |
| tree | f6bb51ff681ee2036c1bf46ad264c812e0320837 /telephony | |
| parent | 27f889d07ced48fbc7fa61c41a4a32ec3e1a95f3 (diff) | |
| parent | 4d6233b2edd24c83efe10f4403456b8d0c87241a (diff) | |
| download | frameworks_base-aff9ec70e22abb64149e335ae2eb519c6027eb4a.zip frameworks_base-aff9ec70e22abb64149e335ae2eb519c6027eb4a.tar.gz frameworks_base-aff9ec70e22abb64149e335ae2eb519c6027eb4a.tar.bz2 | |
am 4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTE
* commit '4d6233b2edd24c83efe10f4403456b8d0c87241a':
Clean up some debug statements.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/DataCallState.java | 8 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/telephony/java/com/android/internal/telephony/DataCallState.java b/telephony/java/com/android/internal/telephony/DataCallState.java index 1d67d45..f5651e0 100644 --- a/telephony/java/com/android/internal/telephony/DataCallState.java +++ b/telephony/java/com/android/internal/telephony/DataCallState.java @@ -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(); } diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index dcde71a..19c06f6 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -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"); } } |