diff options
| author | Nancy Chen <nancychen@google.com> | 2014-09-17 14:15:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-17 14:15:42 +0000 |
| commit | a103b9d93feade7a4d9d4bac5b87b7e29d36a830 (patch) | |
| tree | 6347c3b2fa5eab77ed10643e4fc79fe25bf8ebe8 | |
| parent | ac26025fe262b3a95bcee9719708ba04b560fd49 (diff) | |
| parent | 2442968f2bbb82d86858e7aaff8a58c9aacd7330 (diff) | |
am 2442968f: am c648e368: am f187c51b: am 6b080357: Merge "Remove ability to enable/disable phoneaccounts (4/6)" into lmp-dev
* commit '2442968f2bbb82d86858e7aaff8a58c9aacd7330':
Remove ability to enable/disable phoneaccounts (4/6)
| -rw-r--r-- | src/com/android/dialer/calllog/PhoneAccountUtils.java | 2 | ||||
| -rw-r--r-- | tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/dialer/calllog/PhoneAccountUtils.java b/src/com/android/dialer/calllog/PhoneAccountUtils.java index 941ac4bc5..d716aee49 100644 --- a/src/com/android/dialer/calllog/PhoneAccountUtils.java +++ b/src/com/android/dialer/calllog/PhoneAccountUtils.java @@ -71,7 +71,7 @@ public class PhoneAccountUtils { final TelecomManager telecomManager = (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE); final PhoneAccount account = telecomManager.getPhoneAccount(phoneAccount); - if (account == null || !telecomManager.hasMultipleEnabledAccounts()) { + if (account == null || !telecomManager.hasMultipleCallCapableAccounts()) { return null; } return account; diff --git a/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java b/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java index 81585cc62..2e90c4d33 100644 --- a/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java +++ b/tests/src/com/android/dialer/tests/calllog/FillCallLogTestActivity.java @@ -399,7 +399,7 @@ public class FillCallLogTestActivity extends Activity { private PhoneAccountHandle getManualAccount() { TelecomManager telecomManager = TelecomManager.from(this); - List <PhoneAccountHandle> accountHandles = telecomManager.getEnabledPhoneAccounts(); + List <PhoneAccountHandle> accountHandles = telecomManager.getCallCapablePhoneAccounts(); if (mAccount0.isChecked()) { return accountHandles.get(0); } else if (mAccount1.isChecked()){ |