1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
index 43f163016..7035ffb1d 100644
--- a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
+++ b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java
@@ -27,7 +27,8 @@ import android.provider.CallLog.Calls;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 
-import com.android.contacts.incall.InCallPluginHelper;
+import com.android.phone.common.incall.ContactsDataSubscription;
+import com.android.phone.common.incall.utils.CallMethodFilters;
 import com.google.common.annotations.VisibleForTesting;
 
 import com.android.contacts.common.util.PermissionsUtil;
@@ -71,9 +72,9 @@ public class CallLogInteractionsLoader extends AsyncTaskLoader<List<ContactInter
             }
         }
         // add plugin entries
-        if (InCallPluginHelper.infoReady()) {
-            HashMap<ComponentName, CallMethodInfo> inCallPlugins = InCallPluginHelper
-                    .getAllEnabledCallMethods();
+        if (ContactsDataSubscription.infoReady()) {
+            HashMap<ComponentName, CallMethodInfo> inCallPlugins = CallMethodFilters
+                    .getAllEnabledCallMethods(ContactsDataSubscription.get(getContext()));
             if (inCallPlugins != null) {
                 for (ComponentName cn : inCallPlugins.keySet()) {
                     List<String> accountList = mPluginAccountsMap.get(cn);
@@ -172,8 +173,8 @@ public class CallLogInteractionsLoader extends AsyncTaskLoader<List<ContactInter
                 {
                     // PSTN dialed through a plugin
                     if (cmi == null) {
-                        cmi = InCallPluginHelper.getCallMethod(ComponentName.unflattenFromString
-                                (interaction.getPluginPkgName()));
+                        cmi = ContactsDataSubscription.get(mContext).getPluginIfExists(ComponentName
+                                .unflattenFromString(interaction.getPluginPkgName()));
                     }
                     // No matching plugin, skip
                     if (cmi == null) continue;