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

Merge change 22282 into eclair

Browse Source 
* changes:
  Fix Calling screen shows "In Call" on pressing mute button
This commit is contained in:
Android (Google) Code Review
2009-08-21 09:55:41 -07:00
parent 475ead0c51 5abc78405f
commit c813129fe7
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/com/android/internal/telephony/cdma/CdmaCallTracker.java Executable file → Normal file
View File

@@ -294,8 +294,14 @@ public final class CdmaCallTracker extends CallTracker {
// Should we bother with this check? // Should we bother with this check?
if (ringingCall.getState() == CdmaCall.State.INCOMING) { if (ringingCall.getState() == CdmaCall.State.INCOMING) {
throw new CallStateException("cannot be in the incoming state"); throw new CallStateException("cannot be in the incoming state");
} else { } else if (foregroundCall.getConnections().size() > 1) {
flashAndSetGenericTrue(); flashAndSetGenericTrue();
} else {
// Send a flash command to CDMA network for putting the other party on hold.
// For CDMA networks which do not support this the user would just hear a beep
// from the network. For CDMA networks which do support it will put the other
// party on hold.
cm.sendCDMAFeatureCode("", obtainMessage(EVENT_SWITCH_RESULT));
} }
} }