am c48280c2: am 8c24233d: Send DTMF tones for dialing call

* commit 'c48280c2d0826ced7cf0959c76d04ddc24e7c4f5':
  Send DTMF tones for dialing call

2 files changed, 10 insertions, 2 deletions

diff --git a/InCallUI/src/com/android/incallui/CallList.java b/InCallUI/src/com/android/incallui/CallList.java
index ed52071e9..40fcf534c 100644
--- a/InCallUI/src/com/android/incallui/CallList.java
+++ b/InCallUI/src/com/android/incallui/CallList.java
@@ -211,6 +211,14 @@ public class CallList implements InCallPhoneListener {
         return retval;
     }
 
+    public Call getOutgoingOrActive() {
+        Call retval = getOutgoingCall();
+        if (retval == null) {
+            retval = getActiveCall();
+        }
+        return retval;
+    }
+
     /**
      * A call that is waiting for {@link PhoneAccount} selection
      */
diff --git a/InCallUI/src/com/android/incallui/DialpadPresenter.java b/InCallUI/src/com/android/incallui/DialpadPresenter.java
index d76e6e9b7..c4ee02102 100644
--- a/InCallUI/src/com/android/incallui/DialpadPresenter.java
+++ b/InCallUI/src/com/android/incallui/DialpadPresenter.java
@@ -30,7 +30,7 @@ public class DialpadPresenter extends Presenter<DialpadPresenter.DialpadUi>
     public void onUiReady(DialpadUi ui) {
         super.onUiReady(ui);
         InCallPresenter.getInstance().addListener(this);
-        mCall = CallList.getInstance().getActiveCall();
+        mCall = CallList.getInstance().getOutgoingOrActive();
     }
 
     @Override
@@ -42,7 +42,7 @@ public class DialpadPresenter extends Presenter<DialpadPresenter.DialpadUi>
     @Override
     public void onStateChange(InCallPresenter.InCallState oldState,
             InCallPresenter.InCallState newState, CallList callList) {
-        mCall = callList.getActiveCall();
+        mCall = callList.getOutgoingOrActive();
         Log.d(this, "DialpadPresenter mCall = " + mCall);
     }