summaryrefslogtreecommitdiffstats
path: root/src/com/android/contacts
diff options
context:
space:
mode:
authorErica Chang <echang@cyngn.com>2016-03-02 16:04:11 -0800
committerErica Chang <echang@cyngn.com>2016-04-07 12:05:49 -0700
commit4f95d89bfb5dd9a46c2ba0914465383822bf0f5b (patch)
treece00adaa381d022987c1740da3b8204180f5cbde /src/com/android/contacts
parente73c0174600f21646ac6374b877a4356ad6ac5a2 (diff)
downloadpackages_apps_Contacts-4f95d89bfb5dd9a46c2ba0914465383822bf0f5b.tar.gz
packages_apps_Contacts-4f95d89bfb5dd9a46c2ba0914465383822bf0f5b.tar.bz2
packages_apps_Contacts-4f95d89bfb5dd9a46c2ba0914465383822bf0f5b.zip
Contacts Card: fixed plugin call log
The original implementation skipped call log gathering if the contact does not have any phone number. The fix was to add the check for plugin account too. Change-Id: I96d07edcab9ec023114e61cb76c7938e4a80bbdb
Diffstat (limited to 'src/com/android/contacts')
-rw-r--r--src/com/android/contacts/interactions/CallLogInteractionsLoader.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
index c64421c84..43f163016 100644
--- a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
+++ b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
@@ -57,10 +57,10 @@ public class CallLogInteractionsLoader extends AsyncTaskLoader<List<ContactInter
@Override
public List<ContactInteraction> loadInBackground() {
- if (!PermissionsUtil.hasPhonePermissions(getContext())
- || !getContext().getPackageManager()
- .hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
- || (mPhoneNumbers == null || mPhoneNumbers.length <= 0 || mMaxToRetrieve <= 0)) {
+ if (!PermissionsUtil.hasPhonePermissions(getContext()) || !getContext().getPackageManager()
+ .hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
+ || (((mPhoneNumbers == null || mPhoneNumbers.length <= 0 || mMaxToRetrieve <= 0))
+ && (mPluginAccountsMap == null || mPluginAccountsMap.size() == 0))) {
return Collections.emptyList();
}