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

am 92b5caa4: Merge change Id8df149c into eclair

Browse Source 
Merge commit '92b5caa4e21d48db6efeddba532d1546c6e686b1' into eclair-mr2

* commit '92b5caa4e21d48db6efeddba532d1546c6e686b1':
  Turn some logging back on in ConnectionManager
This commit is contained in:
Robert Greenwalt
2009-10-06 15:40:27 -07:00
committed by Android Git Automerger
parent ca4efac94f 92b5caa4e2
commit e8830120c8
2 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/net/MobileDataStateTracker.java
View File

@@ -42,7 +42,7 @@ import android.text.TextUtils;
public class MobileDataStateTracker extends NetworkStateTracker {
private static final String TAG = "MobileDataStateTracker";
private static final boolean DBG = false;
private static final boolean DBG = true;
private Phone.DataState mMobileDataState;
private ITelephony mPhoneService;
@@ -142,11 +142,6 @@ public class MobileDataStateTracker extends NetworkStateTracker {
boolean unavailable = intent.getBooleanExtra(Phone.NETWORK_UNAVAILABLE_KEY,
false);
if (DBG) Log.d(TAG, mApnType + " Received " + intent.getAction() +
" broadcast - state = " + state + ", oldstate = " + mMobileDataState +
", unavailable = " + unavailable + ", reason = " +
(reason == null ? "(unspecified)" : reason) +
", apnTypeList = " + apnTypeList);
// set this regardless of the apnTypeList. It's all the same radio/network
// underneath
@@ -166,14 +161,17 @@ public class MobileDataStateTracker extends NetworkStateTracker {
" for " + mApnType);
mInterfaceName = intent.getStringExtra(Phone.DATA_IFACE_NAME_KEY);
}
if (DBG) Log.d(TAG, " dropped - mEnabled = false");
return;
}
} else {
if (DBG) Log.d(TAG, " dropped - wrong Apn");
return;
}
if (DBG) Log.d(TAG, mApnType + " Received state= " + state + ", old= " +
mMobileDataState + ", reason= " +
(reason == null ? "(unspecified)" : reason) +
", apnTypeList= " + apnTypeList);
if (mMobileDataState != state) {
mMobileDataState = state;
switch (state) {