diff options
| author | Danny Baumann <dannybaumann@web.de> | 2016-04-29 14:06:06 +0200 |
|---|---|---|
| committer | Danny Baumann <dannybaumann@web.de> | 2016-05-10 11:45:10 +0200 |
| commit | 83ca75f69021d76e6656a20ccaa0b1235eb8924f (patch) | |
| tree | 3ddc7e3deae8ee16aa85dc0f79f938ae19450262 | |
| parent | cf179d064bc30e607b1f5d1fba48cfe02d3fa93e (diff) | |
| download | android_packages_apps_Contacts-83ca75f69021d76e6656a20ccaa0b1235eb8924f.tar.gz android_packages_apps_Contacts-83ca75f69021d76e6656a20ccaa0b1235eb8924f.tar.bz2 android_packages_apps_Contacts-83ca75f69021d76e6656a20ccaa0b1235eb8924f.zip | |
Track changes to AmbientDataSubscription.
Change-Id: Ica281e4e4ce7384b18626e3347df6e96bc0385ba
| -rw-r--r-- | src/com/android/contacts/interactions/CallLogInteractionsLoader.java | 9 | ||||
| -rw-r--r-- | src/com/android/contacts/quickcontact/QuickContactActivity.java | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java index 7035ffb1d..27cc1569a 100644 --- a/src/com/android/contacts/interactions/CallLogInteractionsLoader.java +++ b/src/com/android/contacts/interactions/CallLogInteractionsLoader.java @@ -72,9 +72,10 @@ public class CallLogInteractionsLoader extends AsyncTaskLoader<List<ContactInter } } // add plugin entries - if (ContactsDataSubscription.infoReady()) { - HashMap<ComponentName, CallMethodInfo> inCallPlugins = CallMethodFilters - .getAllEnabledCallMethods(ContactsDataSubscription.get(getContext())); + ContactsDataSubscription subscription = ContactsDataSubscription.get(getContext()); + if (subscription.infoReady()) { + HashMap<ComponentName, CallMethodInfo> inCallPlugins = + CallMethodFilters.getAllEnabledCallMethods(subscription); if (inCallPlugins != null) { for (ComponentName cn : inCallPlugins.keySet()) { List<String> accountList = mPluginAccountsMap.get(cn); @@ -227,4 +228,4 @@ public class CallLogInteractionsLoader extends AsyncTaskLoader<List<ContactInter mData.clear(); } } -}
\ No newline at end of file +} diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java index 9de8141c4..869800a7e 100644 --- a/src/com/android/contacts/quickcontact/QuickContactActivity.java +++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java @@ -1511,7 +1511,7 @@ public class QuickContactActivity extends ContactsActivity implements Set<String> pluginMimeExcluded; Set<String> pluginMimeIncluded; ContactsDataSubscription subscription = ContactsDataSubscription.get(this); - if (ContactsDataSubscription.infoReady()) { + if (subscription.infoReady()) { mCallMethodMap = CallMethodFilters.getAllEnabledAndHiddenCallMethods(subscription); pluginMimeExcluded = MimeTypeUtils.getAllEnabledVideoImMimeSet(subscription); pluginMimeIncluded = MimeTypeUtils.getAllEnabledVoiceMimeSet(subscription); @@ -1616,8 +1616,8 @@ public class QuickContactActivity extends ContactsActivity implements } } } - if (!mContactData.isUserProfile() && ContactsDataSubscription.infoReady() && mCallMethodMap - .size() > 0) { + if (!mContactData.isUserProfile() && subscription.infoReady() + && !mCallMethodMap.isEmpty()) { addAllInCallPluginOtherEntries(contactCardEntries, pluginAccountsMap); } |