diff options
author | Yorke Lee <yorkelee@google.com> | 2014-11-19 00:16:11 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 00:16:11 +0000 |
commit | 524ac2d55c5bf9a938b619a443aa616beef2dab4 (patch) | |
tree | 1b81afca5fa34edab4b37ecfadbedd5ff5857ced | |
parent | de5a2d0fd705bc245f4516ed6e37114379c54a3a (diff) | |
parent | 3dc3e0bdb91e12ffd4b1641f88411fc18847133c (diff) |
am 7ec10b5a: Send DTMF tones for dialing call
* commit '7ec10b5a9976b5c9ebff273bb81f27ed607e8b63':
Send DTMF tones for dialing call
-rw-r--r-- | InCallUI/src/com/android/incallui/CallList.java | 8 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/DialpadPresenter.java | 4 |
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); } |