Merge "Add debug to CallManager#canDial." into honeycomb

This commit is contained in:
Wink Saville
2011-01-25 11:02:25 -08:00
committed by Android (Google) Code Review

View File

@@ -774,12 +774,22 @@ public final class CallManager {
boolean allLinesTaken = hasActiveCall && hasHoldingCall; boolean allLinesTaken = hasActiveCall && hasHoldingCall;
Call.State fgCallState = getActiveFgCallState(); Call.State fgCallState = getActiveFgCallState();
return (serviceState != ServiceState.STATE_POWER_OFF boolean result = (serviceState != ServiceState.STATE_POWER_OFF
&& !hasRingingCall && !hasRingingCall
&& !allLinesTaken && !allLinesTaken
&& ((fgCallState == Call.State.ACTIVE) && ((fgCallState == Call.State.ACTIVE)
|| (fgCallState == Call.State.IDLE) || (fgCallState == Call.State.IDLE)
|| (fgCallState == Call.State.DISCONNECTED))); || (fgCallState == Call.State.DISCONNECTED)));
if (result == false) {
Log.d(LOG_TAG, "canDial serviceState=" + serviceState
+ " hasRingingCall=" + hasRingingCall
+ " hasActiveCall=" + hasActiveCall
+ " hasHoldingCall=" + hasHoldingCall
+ " allLinesTaken=" + allLinesTaken
+ " fgCallState=" + fgCallState);
}
return result;
} }
/** /**