summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2010-10-25 19:42:08 -0700
committerEric Laurent <elaurent@google.com>2010-10-25 19:45:39 -0700
commit164a8f86c7e48992691368c4895709c3bdb835a4 (patch)
tree7cf2df63ba49be13fe25f80a1662f6b8a3782d24 /telephony/java
parent79e76f52a6235c01aec64a978e33b89cbb9e1c2e (diff)
downloadframeworks_base-164a8f86c7e48992691368c4895709c3bdb835a4.zip
frameworks_base-164a8f86c7e48992691368c4895709c3bdb835a4.tar.gz
frameworks_base-164a8f86c7e48992691368c4895709c3bdb835a4.tar.bz2
Partial fix for issue 3124895.
When a SIP call is put on hold and no other call is active, the audio mode should not be switched to incall. Change-Id: I1307330f10cbfb9c4223bcb9dc4faa79778750af
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/com/android/internal/telephony/CallManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/CallManager.java b/telephony/java/com/android/internal/telephony/CallManager.java
index ab7b601..5f9a3e7 100644
--- a/telephony/java/com/android/internal/telephony/CallManager.java
+++ b/telephony/java/com/android/internal/telephony/CallManager.java
@@ -380,7 +380,7 @@ public final class CallManager {
break;
case OFFHOOK:
Phone fgPhone = getFgPhone();
- if (!(fgPhone instanceof SipPhone)) {
+ if (hasActiveFgCall() && !(fgPhone instanceof SipPhone)) {
mode = AudioManager.MODE_IN_CALL;
}
break;