commit 2b73bd63e64f7ef2e74b8782d9eeb4e5fc9964f0
author Santos Cordon <santoscordon@google.com> Tue Aug 27 14:53:43 2013 -0700
committer Santos Cordon <santoscordon@google.com> Tue Aug 27 15:18:16 2013 -0700
tree d757f5b6885e2cb764743e21aa24d0c4d24df12c
parent e0585f39a8a933540d234db545be5bcd54e55f26

DTMF Tones work in dialing state

plus some additional logging.

bug:10425120
Change-Id: I2a7ab27a3f387feb091340112dd6e41881c50429

src/com/android/phone/DTMFTonePlayer.java

diff --git a/src/com/android/phone/DTMFTonePlayer.java b/src/com/android/phone/DTMFTonePlayer.java
index 0e27a99..87c071a 100644
--- a/src/com/android/phone/DTMFTonePlayer.java
+++ b/src/com/android/phone/DTMFTonePlayer.java
@@ -327,7 +327,11 @@
         final int len = calls.size();
 
         for (int i = 0; i < len; i++) {
-            hasActiveCall |= (calls.get(i).getState() == Call.State.ACTIVE);
+            // We can also dial while in DIALING state because there are
+            // some connections that never update to an ACTIVE state (no
+            // indication from the network).
+            hasActiveCall |= (calls.get(i).getState() == Call.State.ACTIVE)
+                    || (calls.get(i).getState() == Call.State.DIALING);
             hasIncomingCall |= (calls.get(i).getState() == Call.State.INCOMING);
         }
 
@@ -365,7 +369,7 @@
      */
     private void checkCallState() {
         logD("checkCallState");
-        if (mCallModeler.hasOutstandingActiveCall()) {
+        if (mCallModeler.hasOutstandingActiveOrDialingCall()) {
             startDialerSession();
         } else {
             stopDialerSession();