commit 4015d9e2f59143216e9d749d475e3b1c0ae6a0eb
author Yorke Lee <yorkelee@google.com> Tue Apr 14 14:30:19 2015 -0700
committer Yorke Lee <yorkelee@google.com> Tue Apr 14 14:30:19 2015 -0700
tree 10f646d1d66250d90f37cf3b92a7b35ae5f9a6d3
parent 4fb0b8ebe4e411a2b73688adb01c8ae86a7852c6

Follow TelecomManager API changes

Bug: 20160799
Change-Id: I667fb47cf261703af817a6a16405bcf56f2bf0f7

src/com/android/dialer/SpecialCharSequenceMgr.java

diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java
index 1e68612..9713a28 100644
--- a/src/com/android/dialer/SpecialCharSequenceMgr.java
+++ b/src/com/android/dialer/SpecialCharSequenceMgr.java
@@ -289,7 +289,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;