diff options
Diffstat (limited to 'src/com/android/server/telecom')
| -rw-r--r-- | src/com/android/server/telecom/Call.java | 2 | ||||
| -rw-r--r-- | src/com/android/server/telecom/CallsManager.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/telecom/Call.java index fc90acbe..b8d3893e 100644 --- a/src/com/android/server/telecom/Call.java +++ b/src/com/android/server/telecom/Call.java @@ -2518,7 +2518,7 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, * networks at least), so we still enable this feature even though * SMSes to that number will silently fail. */ - boolean isRespondViaSmsCapable() { + public boolean isRespondViaSmsCapable() { if (mState != CallState.RINGING) { return false; } diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java index c66b3ee0..ef44488a 100644 --- a/src/com/android/server/telecom/CallsManager.java +++ b/src/com/android/server/telecom/CallsManager.java @@ -1945,7 +1945,7 @@ public class CallsManager extends Call.ListenerBase } else { // Hold or disconnect the active call and request call focus for the incoming call. Call activeCall = (Call) mConnectionSvrFocusMgr.getCurrentFocusCall(); - Log.d(this, "Incoming call = %s Ongoing call %s", call, activeCall); + Log.d(this, "answerCall: Incoming call = %s Ongoing call %s", call, activeCall); holdActiveCallForNewCall(call); mConnectionSvrFocusMgr.requestFocus( call, @@ -4449,7 +4449,7 @@ public class CallsManager extends Call.ListenerBase } private boolean canHold(Call call) { - return call.can(Connection.CAPABILITY_HOLD); + return call.can(Connection.CAPABILITY_HOLD) && call.getState() != CallState.DIALING; } private boolean supportsHold(Call call) { |