am 6b080357: Merge "Remove ability to enable/disable phoneaccounts (4/6)" into lmp-dev
* commit '6b0803575d047d405caf98d92511a2974c3b2338':
Remove ability to enable/disable phoneaccounts (4/6)
diff --git a/src/com/android/dialer/calllog/PhoneAccountUtils.java b/src/com/android/dialer/calllog/PhoneAccountUtils.java
index 941ac4b..d716aee 100644
--- a/src/com/android/dialer/calllog/PhoneAccountUtils.java
+++ b/src/com/android/dialer/calllog/PhoneAccountUtils.java
@@ -71,7 +71,7 @@
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 81585cc..2e90c4d 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 @@
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()){