diff options
| author | Nancy Chen <nancychen@google.com> | 2014-09-17 03:40:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-17 03:40:36 +0000 |
| commit | f187c51b03f5dc59e207d228e712890fffdc7d8c (patch) | |
| tree | 944c63b1e9c9d8a9e2076b3e771dbc26b1a03656 | |
| parent | a2b29d5f9bda8a0019f57a737d06a7a24814c3bc (diff) | |
| parent | 6b0803575d047d405caf98d92511a2974c3b2338 (diff) | |
am 6b080357: Merge "Remove ability to enable/disable phoneaccounts (4/6)" into lmp-dev
* commit '6b0803575d047d405caf98d92511a2974c3b2338':
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()){ |