commit 4c33f22fe2a8db07b6fedcd4becf5159bc1c5a22
author Yorke Lee <yorkelee@google.com> Tue Oct 21 17:30:09 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 21 17:30:09 2014 +0000
tree 3c67b20fd44135ecf42072430e0131441e54ca2b
parent c9fe671fe1e780cf6d6e2bb59ddb47c51ea038a3
parent 60b6e2830ee5c7d11c0fb8018595bf174d94a086

Merge "Protect against INCALL->RINGING transition in AudioManager" into lmp-dev

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 c24a9c0..a89dcea 100644
--- a/src/com/android/server/telecom/CallAudioManager.java
+++ b/src/com/android/server/telecom/CallAudioManager.java
@@ -392,7 +392,12 @@
         Preconditions.checkState(hasFocus());
         int oldMode = mAudioManager.getMode();
         Log.v(this, "Request to change audio mode from %d to %d", oldMode, newMode);
+
         if (oldMode != newMode) {
+            if (oldMode == AudioManager.MODE_IN_CALL && newMode == AudioManager.MODE_RINGTONE) {
+                Log.i(this, "Transition from IN_CALL -> RINGTONE. Resetting to NORMAL first.");
+                mAudioManager.setMode(AudioManager.MODE_NORMAL);
+            }
             mAudioManager.setMode(newMode);
             mMostRecentlyUsedMode = newMode;
         }