diff options
| author | Nancy Chen <nancychen@google.com> | 2014-09-17 03:23:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-17 03:23:09 +0000 |
| commit | 6b0803575d047d405caf98d92511a2974c3b2338 (patch) | |
| tree | 7affdd2df06a702130c58b79c9055a2e693cd0c5 | |
| parent | 58965944ccb1b255ed5862ff9d3ae2d889c1212e (diff) | |
| parent | fb49f977e59c142aee019fa5aa040e7308e534e0 (diff) | |
Merge "Remove ability to enable/disable phoneaccounts (4/6)" into lmp-dev
| -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()){ |