commit 1582ac15d1f30a651000aa5d5098d73be3aa4810
author Yorke Lee <yorkelee@google.com> Wed Apr 15 21:24:22 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 15 21:24:22 2015 +0000
tree 8e2da21eb2af4a5f9cb2c4b4ac3ff179ae7bd9e0
parent 4015d9e2f59143216e9d749d475e3b1c0ae6a0eb
parent 3af7e5675e118b3f135b5bab1da1f666c8f268d6

Merge "Use TelecommManager.getDefaultOutgoingPhoneAccount"

src/com/android/dialer/SpecialCharSequenceMgr.java

diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java
index 88fad95..36145aa 100644
--- a/src/com/android/dialer/SpecialCharSequenceMgr.java
+++ b/src/com/android/dialer/SpecialCharSequenceMgr.java
@@ -290,7 +290,7 @@
                     @Override
                     public void onPhoneAccountSelected(PhoneAccountHandle selectedAccountHandle,
                             boolean setDefault) {
-                        telecomManager.handleMmi(selectedAccountHandle, input);
+                        telecomManager.handleMmi(input, selectedAccountHandle);
                         //TODO: show error dialog if result isn't valid
                     }
                     @Override

src/com/android/dialer/calllog/PhoneAccountUtils.java

diff --git a/src/com/android/dialer/calllog/PhoneAccountUtils.java b/src/com/android/dialer/calllog/PhoneAccountUtils.java
index f80ffd0..d63b940 100644
--- a/src/com/android/dialer/calllog/PhoneAccountUtils.java
+++ b/src/com/android/dialer/calllog/PhoneAccountUtils.java
@@ -92,7 +92,7 @@
         TelecomManager telecomManager =
                 (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
         final PhoneAccount account = telecomManager.getPhoneAccount(accountHandle);
-        if (!telecomManager.hasMultipleCallCapableAccounts()) {
+        if (telecomManager.getCallCapablePhoneAccounts().size() <= 1) {
             return null;
         }
         return account;