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

am cde85d57: Merge "Add debug for tracking bug 3404006." into honeycomb

Browse Source 
* commit 'cde85d573873adce9ebcf0d2c4c2c5c1b8d465cc':
  Add debug for tracking bug 3404006.
This commit is contained in:
Wink Saville
2011-01-30 23:14:39 -08:00
committed by Android Git Automerger
parent 5a7737138e cde85d5738
commit bac75416d1
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
telephony/java/com/android/internal/telephony/DataConnectionTracker.java
View File

@@ -531,7 +531,9 @@ public abstract class DataConnectionTracker extends Handler {
* {@code true} otherwise.
*/
public synchronized boolean getAnyDataEnabled() {
return (mInternalDataEnabled && mDataEnabled && (enabledCount != 0));
boolean result = (mInternalDataEnabled && mDataEnabled && (enabledCount != 0));
if (!result && DBG) log("getAnyDataEnabled " + result);
return result;
}
protected abstract void startNetStatPoll();
@@ -657,7 +659,13 @@ public abstract class DataConnectionTracker extends Handler {
// disabled apn's still need avail/unavail notificiations - send them out
protected void notifyOffApnsOfAvailability(String reason, boolean availability) {
if (mAvailability == availability) return;
if (mAvailability == availability) {
if (DBG) {
log("notifyOffApnsOfAvailability: no change in availability, " +
"not nofitying about reason='" + reason + "' availability=" + availability);
}
return;
}
mAvailability = availability;
for (int id = 0; id < APN_NUM_TYPES; id++) {
if (!isApnIdEnabled(id)) {
@@ -685,10 +693,13 @@ public abstract class DataConnectionTracker extends Handler {
* @return {@code true} if data connectivity is possible, {@code false} otherwise.
*/
protected boolean isDataPossible() {
boolean possible = (isDataAllowed()
&& !(getAnyDataEnabled() && (mState == State.FAILED || mState == State.IDLE)));
if (!possible && DBG && isDataAllowed()) {
log("Data not possible. No coverage: dataState = " + mState);
boolean dataAllowed = isDataAllowed();
boolean anyDataEnabled = getAnyDataEnabled();
boolean possible = (dataAllowed
&& !(anyDataEnabled && (mState == State.FAILED || mState == State.IDLE)));
if (!possible && DBG) {
log("isDataPossible() " + possible + ", dataAllowed=" + dataAllowed +
" anyDataEnabled=" + anyDataEnabled + " dataState=" + mState);
}
return possible;
}