diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-05-28 22:29:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-28 22:29:53 +0000 |
| commit | a89ca5e585398f88b2577553d81220f5f5447fb7 (patch) | |
| tree | f6192952efd202bf78c9b4c69e748ed7075ae5a2 | |
| parent | ad765758ffc0f060e0f4e8ab4317e7248a46700a (diff) | |
| parent | 8246d5b8def41e010a794196bed1301022e0f97d (diff) | |
| download | Contacts-platform-tools-29.0.1.tar.gz | |
Merge "Snap for 5611628 from 6d09f9313f7fa130aaca67cbafba74acb04fcca8 to sdk-release" into sdk-releaseplatform-tools-29.0.1
| -rw-r--r-- | src/com/android/contacts/model/ContactLoader.java | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/src/com/android/contacts/model/ContactLoader.java b/src/com/android/contacts/model/ContactLoader.java index acb821203..af46fc2cf 100644 --- a/src/com/android/contacts/model/ContactLoader.java +++ b/src/com/android/contacts/model/ContactLoader.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; +import android.content.pm.ResolveInfo; import android.content.res.AssetFileDescriptor; import android.content.res.Resources; import android.database.Cursor; @@ -44,6 +45,7 @@ import com.android.contacts.compat.CompatUtils; import com.android.contacts.group.GroupMetaData; import com.android.contacts.model.account.AccountType; import com.android.contacts.model.account.AccountTypeWithDataSet; +import com.android.contacts.model.account.GoogleAccountType; import com.android.contacts.model.dataitem.DataItem; import com.android.contacts.model.dataitem.PhoneDataItem; import com.android.contacts.model.dataitem.PhotoDataItem; @@ -895,13 +897,34 @@ public class ContactLoader extends AsyncTaskLoader<Contact> { mNotifiedRawContactIds.add(rawContactId); final AccountType accountType = rawContact.getAccountType(context); final String serviceName = accountType.getViewContactNotifyServiceClassName(); - final String servicePackageName = accountType.getViewContactNotifyServicePackageName(); + final String servicePackageName = accountType + .getViewContactNotifyServicePackageName(); if (!TextUtils.isEmpty(serviceName) && !TextUtils.isEmpty(servicePackageName)) { final Uri uri = ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId); final Intent intent = new Intent(); + intent.setDataAndType(uri, RawContacts.CONTENT_ITEM_TYPE); + if (accountType instanceof GoogleAccountType) { + intent.setPackage(servicePackageName); + intent + .setAction("com.google.android.syncadapters.contacts.SYNC_HIGH_RES_PHOTO"); + List<ResolveInfo> broadcastReceivers = + context.getPackageManager().queryBroadcastReceivers(intent, 0); + if (!broadcastReceivers.isEmpty()) { + if (Log.isLoggable(TAG, Log.DEBUG)) { + for (ResolveInfo broadcastReceiver : broadcastReceivers) { + Log.d(TAG, broadcastReceiver.activityInfo.toString()); + } + } + context.sendBroadcast(intent); + continue; + } + } + // TODO: Social Stream API is deprecated, and once the opted-in + // sync adapters target Android O+, we won't be able to start their services + // since they'll likely be in the background, so we'll need to remove the + // startService call. intent.setClassName(servicePackageName, serviceName); intent.setAction(Intent.ACTION_VIEW); - intent.setDataAndType(uri, RawContacts.CONTENT_ITEM_TYPE); try { context.startService(intent); } catch (Exception e) { |