commit 3e98e3086a004a291c0ae9a380c2dfe89ac0ea63
author Linux Build Service Account <lnxbuild@localhost> Fri Oct 23 05:04:52 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Oct 23 05:04:52 2015 -0700
tree 41ca72c1afa448bcdd086c2d752ba002957781b4
parent bcb3740953bec96a078c1a7ea13f16222f2a5eb1
parent 9ae7008cb1aa94d7ee537e7e67aec2809cae1486

Merge "Dont set audio mode as MODE_IN_CALL when MT call is rejected"

src/com/android/server/telecom/CallAudioManager.java

diff --git a/src/com/android/server/telecom/CallAudioManager.java b/src/com/android/server/telecom/CallAudioManager.java
index 74b4cbb..72a8158 100644
--- a/src/com/android/server/telecom/CallAudioManager.java
+++ b/src/com/android/server/telecom/CallAudioManager.java
@@ -422,17 +422,11 @@
     }
 
     private void onCallUpdated(Call call) {
-
-        if (call != null) {
-            if (call.getState() != CallState.DISCONNECTED) {
-                updateAudioStreamAndMode(call);
-            }
-
-            if (call.getState() == CallState.ACTIVE &&
+        updateAudioStreamAndMode(call);
+        if (call != null && call.getState() == CallState.ACTIVE &&
                             call == mCallToSpeedUpMTAudio) {
                 mCallToSpeedUpMTAudio = null;
             }
-        }
     }
 
     private void setSystemAudioState(boolean isMuted, int route, int supportedRouteMask) {
@@ -520,7 +514,8 @@
                 Log.v(this, "updateAudioStreamAndMode : no foreground, speeding up MT audio.");
                 requestAudioFocusAndSetMode(AudioManager.STREAM_VOICE_CALL,
                                                          AudioManager.MODE_IN_CALL);
-            } else if (foregroundCall != null && waitingForAccountSelectionCall == null) {
+            } else if (foregroundCall != null && waitingForAccountSelectionCall == null
+                    && (foregroundCall.getState() != CallState.DISCONNECTED)) {
                 // In the case where there is a call that is waiting for account selection,
                 // this will fall back to abandonAudioFocus() below, which temporarily exits
                 // the in-call audio mode. This is to allow TalkBack to speak the "Call with"
@@ -538,7 +533,7 @@
                 Log.v(this, "updateAudioStreamAndMode : tone playing");
                 requestAudioFocusAndSetMode(
                         AudioManager.STREAM_VOICE_CALL, mMostRecentlyUsedMode);
-            } else if (!hasRingingForegroundCall()) {
+            } else if (call == null) {
                 Log.v(this, "updateAudioStreamAndMode : no ringing call");
                 abandonAudioFocus();
             } else {